Skip to content

S
swiftshader
Commit a0600301 by Nicolas Capens
Options

Fix validating the current context on eglSwapInterval.

Change-Id: I7f62eae32d2122ec14f400841eaefa3712cf582d Reviewed-on: https://swiftshader-review.googlesource.com/5291Tested-by: 's avatarNicolas Capens <capn@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent eb3e3080
Showing with 5 additions and 4 deletions
src/OpenGL/libEGL/libEGL.cpp
...@@ -565,7 +565,7 @@ EGLBoolean BindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer) ...@@ -565,7 +565,7 @@ EGLBoolean BindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
return error(EGL_BAD_MATCH, EGL_FALSE); return error(EGL_BAD_MATCH, EGL_FALSE);
} }
egl::Context *context = static_cast<egl::Context*>(egl::getCurrentContext()); egl::Context *context = egl::getCurrentContext();
if(context) if(context)
{ {
...@@ -617,15 +617,16 @@ EGLBoolean SwapInterval(EGLDisplay dpy, EGLint interval) ...@@ -617,15 +617,16 @@ EGLBoolean SwapInterval(EGLDisplay dpy, EGLint interval)
TRACE("(EGLDisplay dpy = %p, EGLint interval = %d)", dpy, interval); TRACE("(EGLDisplay dpy = %p, EGLint interval = %d)", dpy, interval);
egl::Display *display = egl::Display::get(dpy); egl::Display *display = egl::Display::get(dpy);
egl::Context *context = egl::getCurrentContext();
if(!validateDisplay(display)) if(!validateContext(display, context))
{ {
return EGL_FALSE; return EGL_FALSE;
} }
egl::Surface *draw_surface = static_cast<egl::Surface*>(egl::getCurrentDrawSurface()); egl::Surface *draw_surface = static_cast<egl::Surface*>(egl::getCurrentDrawSurface());
if(draw_surface == NULL) if(!draw_surface)
{ {
return error(EGL_BAD_SURFACE, EGL_FALSE); return error(EGL_BAD_SURFACE, EGL_FALSE);
} }
...@@ -1038,7 +1039,7 @@ EGLSyncKHR CreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list ...@@ -1038,7 +1039,7 @@ EGLSyncKHR CreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list
return error(EGL_BAD_ATTRIBUTE, EGL_NO_SYNC_KHR); return error(EGL_BAD_ATTRIBUTE, EGL_NO_SYNC_KHR);
} }
egl::Context *context = static_cast<egl::Context*>(egl::getCurrentContext()); egl::Context *context = egl::getCurrentContext();
if(!validateContext(display, context)) if(!validateContext(display, context))
{ {
......
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