580345 - fix up some GLESv2 vs. desktop GL differences

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Attachment: fix up gl vs glesv2 usage

There are a few annoying differences between GLESv2 and desktop GL that we end up having to #ifdef around a lot; instead, just add a helper function in GLContext that'll do the right thing.  This also removes a bunch of unused entry points from GLConext that were desktop GL-only.

The runtime IsGLES2 checks are there because on Windows, we might have either a desktop GL context or a GLESv2 context via ANGLE (or a future native EGL/GLESv2 impl if one shows up).

Comment 1

[Joe Drew (not getting mail)]

Comment on attachment 458745 [details] [diff] [review]
fix up gl vs glesv2 usage


>diff --git a/content/canvas/src/WebGLContextValidate.cpp b/content/canvas/src/WebGLContextValidate.cpp
>--- a/content/canvas/src/WebGLContextValidate.cpp
>+++ b/content/canvas/src/WebGLContextValidate.cpp
>@@ -398,30 +400,41 @@ WebGLContext::InitAndValidateGL()

>-#ifdef USE_GLES2
>-    gl->fGetIntegerv(LOCAL_GL_MAX_FRAGMENT_UNIFORM_VECTORS, (GLint*) &mGLMaxFragmentUniformVectors);
>-    gl->fGetIntegerv(LOCAL_GL_MAX_VERTEX_UNIFORM_VECTORS, (GLint*) &mGLMaxVertexUniformVectors);
>-    gl->fGetIntegerv(LOCAL_GL_MAX_VARYING_VECTORS, (GLint*) &mGLMaxVaryingVectors);
>+    printf_stderr("four: 0x%04x\n", gl->fGetError());

leftover printf?


>+
>+    if (gl->IsGLES2()) {
>+        gl->fGetIntegerv(LOCAL_GL_MAX_FRAGMENT_UNIFORM_VECTORS, (GLint*) &mGLMaxFragmentUniformVectors);
>+        gl->fGetIntegerv(LOCAL_GL_MAX_VERTEX_UNIFORM_VECTORS, (GLint*) &mGLMaxVertexUniformVectors);
>+        gl->fGetIntegerv(LOCAL_GL_MAX_VARYING_VECTORS, (GLint*) &mGLMaxVaryingVectors);
>+    } else {
>+        gl->fGetIntegerv(LOCAL_GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, (GLint*) &mGLMaxFragmentUniformVectors);
>+        mGLMaxFragmentUniformVectors /= 4;
>+        gl->fGetIntegerv(LOCAL_GL_MAX_VERTEX_UNIFORM_COMPONENTS, (GLint*) &mGLMaxVertexUniformVectors);
>+        mGLMaxVertexUniformVectors /= 4;
>+        gl->fGetIntegerv(LOCAL_GL_MAX_VARYING_FLOATS, (GLint*) &mGLMaxVaryingVectors);
>+        mGLMaxVaryingVectors /= 4;
>+    }
>+
>+    printf_stderr("five: 0x%04x\n", gl->fGetError());

And here

>+
>+#if 0
>+    gl->fGetIntegerv(LOCAL_GL_MAX_COLOR_ATTACHMENTS, (GLint*) &val);
> #else

Why's this #if 0'd out?

>-    gl->fGetIntegerv(LOCAL_GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, (GLint*) &mGLMaxFragmentUniformVectors);
>-    mGLMaxFragmentUniformVectors /= 4;
>-    gl->fGetIntegerv(LOCAL_GL_MAX_VERTEX_UNIFORM_COMPONENTS, (GLint*) &mGLMaxVertexUniformVectors);
>-    mGLMaxVertexUniformVectors /= 4;
>-    gl->fGetIntegerv(LOCAL_GL_MAX_VARYING_FLOATS, (GLint*) &mGLMaxVaryingVectors);
>-    mGLMaxVaryingVectors /= 4;
>+    // Always 1 for GLES2
>+    val = 1;
> #endif
>+    mFramebufferColorAttachments.SetLength(val);
> 
>-    gl->fGetIntegerv(LOCAL_GL_MAX_COLOR_ATTACHMENTS, (GLint*) &val);
>-    mFramebufferColorAttachments.SetLength(val);
>+    printf_stderr("six: 0x%04x\n", gl->fGetError());

another leftover printf

Comment 2

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Indeed, forgot to qrefresh to get rid of the printfs.  The #if 0'd chunk is something that was there earlier, but was incorrect -- GLES2 only supports 1 color attachment, and there is no GL_MAX_COLOR_ATTACHMENTS enum.  So WebGL should never query it, but I left the code in there for some future where we might support multiple color attachments.

Comment 3

[Joe Drew (not getting mail)]

OK, for the #if 0 bits just add a comment to that effect?

Comment 4

[Damon Sicore (:damons)]

Who owns this?  Need an owner ASAP.

Comment 5

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Oooh, me me!

http://hg.mozilla.org/mozilla-central/rev/e6843fbf3073