diff options
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 10 | ||||
| -rwxr-xr-x | opengl/libs/GLES2_dbg/generate_api_cpp.py | 8 | ||||
| -rwxr-xr-x | opengl/libs/GLES2_dbg/generate_debugger_message_proto.py | 4 |
3 files changed, 6 insertions, 16 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 9cf722381f..aabba28bbb 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -1132,16 +1132,6 @@ EGLSurface eglCreateWindowSurface( EGLDisplay dpy, EGLConfig config, EGLConfig iConfig = dp->configs[intptr_t(config)].config; EGLint format; - // for now fail if the window is not a Surface. - int type = -1; - ANativeWindow* anw = reinterpret_cast<ANativeWindow*>(window); - if ((anw->query(window, NATIVE_WINDOW_CONCRETE_TYPE, &type) != 0) || - (type == NATIVE_WINDOW_SURFACE_TEXTURE_CLIENT)) { - LOGE("native window is a SurfaceTextureClient (currently " - "unsupported)"); - return setError(EGL_BAD_NATIVE_WINDOW, EGL_NO_SURFACE); - } - // set the native window's buffers format to match this config if (cnx->egl.eglGetConfigAttrib(iDpy, iConfig, EGL_NATIVE_VISUAL_ID, &format)) { diff --git a/opengl/libs/GLES2_dbg/generate_api_cpp.py b/opengl/libs/GLES2_dbg/generate_api_cpp.py index aeba213d57..96cde57bc1 100755 --- a/opengl/libs/GLES2_dbg/generate_api_cpp.py +++ b/opengl/libs/GLES2_dbg/generate_api_cpp.py @@ -38,7 +38,7 @@ def generate_api(lines): "glShaderSource", "glTexImage2D", "glTexSubImage2D"] # these also needs to be forwarded to DbgContext - contextFunctions = ["glUseProgram", "glEnableVertexAttribArray", "glDisableVertexAttribArray", + contextFunctions = ["glUseProgram", "glEnableVertexAttribArray", "glDisableVertexAttribArray", "glVertexAttribPointer", "glBindBuffer", "glBufferData", "glBufferSubData", "glDeleteBuffers",] for line in lines: @@ -114,10 +114,10 @@ def generate_api(lines): else: getData += " msg.mutable_data()->assign(reinterpret_cast<const char *>(%s), %s * sizeof(%s));" % (paramName, annotation, paramType) paramType += "*" - else: + else: if paramType == "GLfloat" or paramType == "GLclampf" or paramType.find("*") >= 0: setMsgParameters += " msg.set_arg%d(ToInt(%s));\n" % (paramIndex, paramName) - else: + else: setMsgParameters += " msg.set_arg%d(%s);\n" % (paramIndex, paramName) if paramIndex < len(parameters) - 1: arguments += ', ' @@ -156,7 +156,7 @@ def generate_api(lines): } caller;""" print setCallerMembers print setMsgParameters - + if line.find("*") >= 0 or line.find(":") >= 0: print " // FIXME: check for pointer usage" if inout in ["in", "inout"]: diff --git a/opengl/libs/GLES2_dbg/generate_debugger_message_proto.py b/opengl/libs/GLES2_dbg/generate_debugger_message_proto.py index 57e008cafd..535b13e185 100755 --- a/opengl/libs/GLES2_dbg/generate_debugger_message_proto.py +++ b/opengl/libs/GLES2_dbg/generate_debugger_message_proto.py @@ -25,7 +25,7 @@ def generate_egl_entries(output, lines, i): line = line.split(",")[1].strip() #extract EGL function name output.write(" %s = %d;\n" % (line, i)) i += 1 - return i + return i def generate_gl_entries(output,lines,i): @@ -118,7 +118,7 @@ message Message optional int32 arg4 = 16; optional int32 arg5 = 17; optional int32 arg6 = 18; - optional int32 arg7 = 19; + optional int32 arg7 = 19; // glDrawArrays/Elements sets this to active number of attributes optional int32 arg8 = 20; optional bytes data = 10; // variable length data used for GL call |