From: Chia-I Wu <olvaffe@gmail.com>
Date: Sat, 30 Jan 2010 15:13:18 +0000 (+0800)
Subject: st/egl: eglBindTexImage should bind to an OpenGL ES texture.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5714e674c75652c195482a8e607a2d624a5e524e;p=mesa.git

st/egl: eglBindTexImage should bind to an OpenGL ES texture.

The spec says that it only works with OpenGL ES.
---

diff --git a/src/gallium/state_trackers/egl/common/egl_g3d.c b/src/gallium/state_trackers/egl/common/egl_g3d.c
index 3f520851c43..f4c40320867 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)