Commit 1fe351e5 authored by Eric Engestrom's avatar Eric Engestrom

s/EGL_NO_CONFIG_MESA/EGL_NO_CONFIG_KHR/

Signed-off-by: Eric Engestrom's avatarEric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Michel Dänzer's avatarMichel Dänzer <mdaenzer@redhat.com>
parent 6868c72b
Pipeline #75386 passed with stages
in 2 minutes and 56 seconds
......@@ -37,11 +37,6 @@
#include "piglit-util-gl.h"
#include "piglit-util-egl.h"
#ifndef EGL_MESA_configless_context
#define EGL_MESA_configless_context 1
#define EGL_NO_CONFIG_MESA ((EGLConfig)0)
#endif
struct state {
Display *dpy;
EGLDisplay egl_dpy;
......@@ -365,7 +360,7 @@ main(int argc, char **argv)
}
state.ctx = eglCreateContext(state.egl_dpy,
EGL_NO_CONFIG_MESA,
EGL_NO_CONFIG_KHR,
EGL_NO_CONTEXT,
config_attribs);
if (state.ctx == EGL_NO_CONTEXT) {
......
......@@ -68,7 +68,7 @@ static EGLContext
create_context(EGLDisplay dpy, EGLint *attr)
{
EGLContext ctx =
eglCreateContext(dpy, EGL_NO_CONFIG_MESA, EGL_NO_CONTEXT, attr);
eglCreateContext(dpy, EGL_NO_CONFIG_KHR, EGL_NO_CONTEXT, attr);
if (ctx == EGL_NO_CONTEXT) {
fprintf(stderr, "could not create EGL context, attr 0x%x\n", attr[1]);
......@@ -115,7 +115,7 @@ piglit_init(int argc, char **argv)
attr[0] = EGL_CONTEXT_PRIORITY_LEVEL_IMG;
attr[1] = EGL_TRANSPARENT_RED_VALUE;
ctx = eglCreateContext(dpy, EGL_NO_CONFIG_MESA, EGL_NO_CONTEXT, attr);
ctx = eglCreateContext(dpy, EGL_NO_CONFIG_KHR, EGL_NO_CONTEXT, attr);
if (ctx != EGL_NO_CONTEXT) {
fprintf(stderr, "should fail with invalid parameter\n");
......
......@@ -79,7 +79,7 @@ piglit_init(int argc, char **argv)
EGLint ctx_attr[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
EGLContext ctx =
eglCreateContext(dpy, EGL_NO_CONFIG_MESA, EGL_NO_CONTEXT, ctx_attr);
eglCreateContext(dpy, EGL_NO_CONFIG_KHR, EGL_NO_CONTEXT, ctx_attr);
if (ctx == EGL_NO_CONTEXT) {
fprintf(stderr, "could not create EGL context\n");
piglit_report_result(PIGLIT_FAIL);
......
......@@ -73,7 +73,7 @@ int main(int argc, char **argv)
piglit_report_result(PIGLIT_SKIP);
ctx_glx = glXCreateContext(dpy, visinfo, NULL, True);
ctx_egl = eglCreateContext(dpy_egl, EGL_NO_CONFIG_MESA, EGL_NO_CONTEXT, NULL);
ctx_egl = eglCreateContext(dpy_egl, EGL_NO_CONFIG_KHR, EGL_NO_CONTEXT, NULL);
glXMakeContextCurrent(dpy, glxWin, glxWin, ctx_glx);
eglMakeCurrent(dpy_egl, EGL_NO_SURFACE, EGL_NO_SURFACE, ctx_egl);
......
......@@ -100,7 +100,7 @@ int main(int argc, char **argv)
piglit_report_result(PIGLIT_FAIL);
}
ctx1 = eglCreateContext(dpy, EGL_NO_CONFIG_MESA, EGL_NO_CONTEXT, attr);
ctx1 = eglCreateContext(dpy, EGL_NO_CONFIG_KHR, EGL_NO_CONTEXT, attr);
if (!ctx1) {
fprintf(stderr, "glsl-bug-110796: create contexts failed\n");
......@@ -130,7 +130,7 @@ int main(int argc, char **argv)
eglDestroyContext(dpy, ctx1);
ctx2 = eglCreateContext(dpy, EGL_NO_CONFIG_MESA, EGL_NO_CONTEXT, attr);
ctx2 = eglCreateContext(dpy, EGL_NO_CONFIG_KHR, EGL_NO_CONTEXT, attr);
if (!ctx2) {
fprintf(stderr, "glsl-bug-110796: create contexts failed\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment