Mesa (master): st/egl: eglBindTexImage should bind to an OpenGL ES texture.
Chia-I Wu
olv at kemper.freedesktop.org
Sat Jan 30 15:14:09 UTC 2010
Module: Mesa
Branch: master
Commit: 5714e674c75652c195482a8e607a2d624a5e524e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5714e674c75652c195482a8e607a2d624a5e524e
Author: Chia-I Wu <olvaffe at gmail.com>
Date: Sat Jan 30 23:13:18 2010 +0800
st/egl: eglBindTexImage should bind to an OpenGL ES texture.
The spec says that it only works with OpenGL ES.
---
src/gallium/state_trackers/egl/common/egl_g3d.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/gallium/state_trackers/egl/common/egl_g3d.c b/src/gallium/state_trackers/egl/common/egl_g3d.c
index 3f52085..f4c4032 100644
--- a/src/gallium/state_trackers/egl/common/egl_g3d.c
+++ b/src/gallium/state_trackers/egl/common/egl_g3d.c
@@ -1135,8 +1135,7 @@ egl_g3d_bind_tex_image(_EGLDriver *drv, _EGLDisplay *dpy,
PIPE_FLUSH_RENDER_CACHE | PIPE_FLUSH_FRAME, NULL);
}
- /* XXX change to EGL_OPENGL_ES_API once OpenGL ES is merged */
- gctx = egl_g3d_get_current_context(EGL_OPENGL_API);
+ gctx = egl_g3d_get_current_context(EGL_OPENGL_ES_API);
if (gctx) {
if (!gsurf->render_surface)
return EGL_FALSE;
@@ -1163,9 +1162,8 @@ egl_g3d_release_tex_image(_EGLDriver *drv, _EGLDisplay *dpy,
if (gsurf->render_surface) {
_EGLThreadInfo *t = _eglGetCurrentThread();
- /* XXX change to EGL_OPENGL_ES_API once OpenGL ES is merged */
struct egl_g3d_context *gctx = egl_g3d_context(
- t->CurrentContexts[_eglConvertApiToIndex(EGL_OPENGL_API)]);
+ t->CurrentContexts[_eglConvertApiToIndex(EGL_OPENGL_ES_API)]);
/* what if the context the surface binds to is no longer current? */
if (gctx)
More information about the mesa-commit
mailing list