X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glretrace.py;h=6de28828a7f9312b13b4b11c26d90953ceffb0bb;hb=1968164a64a1afa0c409949ed141dfaf129776e3;hp=53afdbedcda465d5e50ba58c1834bb82175dd18f;hpb=5639126509506f30bea6a8126dc1110401b369c5;p=apitrace diff --git a/glretrace.py b/glretrace.py index 53afdbe..6de2882 100644 --- a/glretrace.py +++ b/glretrace.py @@ -27,13 +27,16 @@ """GL retracer generator.""" -import stdapi -import glapi +import specs.stdapi as stdapi +import specs.glapi as glapi +import specs.glesapi as glesapi from retrace import Retracer class GlRetracer(Retracer): + table_name = 'glretrace::gl_callbacks' + def retrace_function(self, function): Retracer.retrace_function(self, function) @@ -76,6 +79,7 @@ class GlRetracer(Retracer): "glDrawArraysInstanced", "glDrawArraysInstancedARB", "glDrawArraysInstancedEXT", + "glDrawArraysInstancedBaseInstance", "glDrawMeshArraysSUN", "glMultiDrawArrays", "glMultiDrawArraysEXT", @@ -88,11 +92,13 @@ class GlRetracer(Retracer): "glDrawElementsIndirect", "glDrawElementsInstanced", "glDrawElementsInstancedARB", - "glDrawElementsInstancedBaseVertex", "glDrawElementsInstancedEXT", + "glDrawElementsInstancedBaseVertex", + "glDrawElementsInstancedBaseInstance", + "glDrawElementsInstancedBaseVertexBaseInstance", "glDrawRangeElements", - "glDrawRangeElementsBaseVertex", "glDrawRangeElementsEXT", + "glDrawRangeElementsBaseVertex", "glMultiDrawElements", "glMultiDrawElementsBaseVertex", "glMultiDrawElementsEXT", @@ -129,7 +135,7 @@ class GlRetracer(Retracer): 'glGetPixelMapuiv', 'glGetPixelMapusv', 'glGetPolygonStipple', - 'glGetSeparableFilter,', + 'glGetSeparableFilter', 'glGetTexImage', 'glReadPixels', 'glGetnCompressedTexImageARB', @@ -145,6 +151,20 @@ class GlRetracer(Retracer): 'glReadnPixelsARB', ]) + map_function_names = set([ + 'glMapBuffer', + 'glMapBufferARB', + 'glMapBufferRange', + 'glMapNamedBufferEXT', + 'glMapNamedBufferRangeEXT' + ]) + + unmap_function_names = set([ + 'glUnmapBuffer', + 'glUnmapBufferARB', + 'glUnmapNamedBufferEXT', + ]) + def retrace_function_body(self, function): is_array_pointer = function.name in self.array_pointer_function_names is_draw_array = function.name in self.draw_array_function_names @@ -190,7 +210,7 @@ class GlRetracer(Retracer): print ' glretrace::snapshot(call.no - 1);' print ' }' if function.name == 'glFrameTerminatorGREMEDY': - print ' glretrace::frame_complete(call.no);' + print ' glretrace::frame_complete(call);' return Retracer.retrace_function_body(self, function) @@ -198,7 +218,7 @@ class GlRetracer(Retracer): # Post-snapshots if function.name in ('glFlush', 'glFinish'): print ' if (!glretrace::double_buffer) {' - print ' glretrace::frame_complete(call.no);' + print ' glretrace::frame_complete(call);' print ' }' if is_draw_array or is_draw_elements or is_misc_draw: print ' if (glretrace::snapshot_frequency == glretrace::FREQUENCY_DRAW) {' @@ -207,23 +227,13 @@ class GlRetracer(Retracer): def call_function(self, function): + # Infer the drawable size from GL calls if function.name == "glViewport": - print ' GLint draw_framebuffer = 0;' - print ' glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &draw_framebuffer);' - print ' if (draw_framebuffer == 0) {' - print ' if (glretrace::drawable) {' - print ' int drawable_width = x + width;' - print ' int drawable_height = y + height;' - print ' if (drawable_width > (int)glretrace::drawable->width ||' - print ' drawable_height > (int)glretrace::drawable->height) {' - print ' glretrace::drawable->resize(drawable_width, drawable_height);' - print ' if (!glretrace::drawable->visible) {' - print ' glretrace::drawable->show();' - print ' }' - print ' glScissor(0, 0, drawable_width, drawable_height);' - print ' }' - print ' }' - print ' }' + print ' glretrace::updateDrawable(x + width, y + height);' + if function.name in ('glBlitFramebuffer', 'glBlitFramebufferEXT'): + # Some applications do all their rendering in a framebuffer, and + # then just blit to the drawable without ever calling glViewport. + print ' glretrace::updateDrawable(std::max(dstX0, dstX1), std::max(dstY0, dstY1));' if function.name == "glEnd": print ' glretrace::insideGlBeginEnd = false;' @@ -245,7 +255,7 @@ class GlRetracer(Retracer): print r' glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &error_position);' print r' if (error_position != -1) {' print r' const char *error_string = (const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB);' - print r' std::cerr << call.no << ": warning: " << error_string << "\n";' + print r' retrace::warning(call) << error_string << "\n";' print r' }' if function.name == 'glCompileShader': print r' GLint compile_status = 0;' @@ -255,7 +265,7 @@ class GlRetracer(Retracer): print r' glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &info_log_length);' print r' GLchar *infoLog = new GLchar[info_log_length];' print r' glGetShaderInfoLog(shader, info_log_length, NULL, infoLog);' - print r' std::cerr << call.no << ": warning: " << infoLog << "\n";' + print r' retrace::warning(call) << infoLog << "\n";' print r' delete [] infoLog;' print r' }' if function.name == 'glLinkProgram': @@ -266,7 +276,7 @@ class GlRetracer(Retracer): print r' glGetProgramiv(program, GL_INFO_LOG_LENGTH, &info_log_length);' print r' GLchar *infoLog = new GLchar[info_log_length];' print r' glGetProgramInfoLog(program, info_log_length, NULL, infoLog);' - print r' std::cerr << call.no << ": warning: " << infoLog << "\n";' + print r' retrace::warning(call) << infoLog << "\n";' print r' delete [] infoLog;' print r' }' if function.name == 'glCompileShaderARB': @@ -277,7 +287,7 @@ class GlRetracer(Retracer): print r' glGetObjectParameterivARB(shaderObj, GL_OBJECT_INFO_LOG_LENGTH_ARB, &info_log_length);' print r' GLchar *infoLog = new GLchar[info_log_length];' print r' glGetInfoLogARB(shaderObj, info_log_length, NULL, infoLog);' - print r' std::cerr << call.no << ": warning: " << infoLog << "\n";' + print r' retrace::warning(call) << infoLog << "\n";' print r' delete [] infoLog;' print r' }' if function.name == 'glLinkProgramARB': @@ -288,29 +298,59 @@ class GlRetracer(Retracer): print r' glGetObjectParameterivARB(programObj, GL_OBJECT_INFO_LOG_LENGTH_ARB, &info_log_length);' print r' GLchar *infoLog = new GLchar[info_log_length];' print r' glGetInfoLogARB(programObj, info_log_length, NULL, infoLog);' - print r' std::cerr << call.no << ": warning: " << infoLog << "\n";' + print r' retrace::warning(call) << infoLog << "\n";' print r' delete [] infoLog;' print r' }' - if function.name in ('glMapBuffer', 'glMapBufferARB', 'glMapBufferRange', 'glMapNamedBufferEXT', 'glMapNamedBufferRangeEXT'): + if function.name in self.map_function_names: print r' if (!__result) {' - print r' std::cerr << call.no << ": warning: failed to map buffer\n";' + print r' retrace::warning(call) << "failed to map buffer\n";' print r' }' if function.name in ('glGetAttribLocation', 'glGetAttribLocationARB'): print r' GLint __orig_result = call.ret->toSInt();' print r' if (__result != __orig_result) {' - print r' std::cerr << call.no << ": warning: vertex attrib location mismatch " << __orig_result << " -> " << __result << "\n";' + print r' retrace::warning(call) << "vertex attrib location mismatch " << __orig_result << " -> " << __result << "\n";' print r' }' if function.name in ('glCheckFramebufferStatus', 'glCheckFramebufferStatusEXT', 'glCheckNamedFramebufferStatusEXT'): print r' GLint __orig_result = call.ret->toSInt();' print r' if (__orig_result == GL_FRAMEBUFFER_COMPLETE &&' print r' __result != GL_FRAMEBUFFER_COMPLETE) {' - print r' std::cerr << call.no << ": warning: incomplete framebuffer (" << glstate::enumToString(__result) << ")\n";' + print r' retrace::warning(call) << "incomplete framebuffer (" << glstate::enumToString(__result) << ")\n";' print r' }' print ' }' + # Update buffer mappings + if function.name in self.map_function_names: + print r' if (__result) {' + print r' unsigned long long __address = call.ret->toUIntPtr();' + if 'BufferRange' not in function.name: + print r' GLint length = 0;' + if function.name == 'glMapBuffer': + print r' glGetBufferParameteriv(target, GL_BUFFER_SIZE, &length);' + elif function.name == 'glMapBufferARB': + print r' glGetBufferParameterivARB(target, GL_BUFFER_SIZE_ARB, &length);' + elif function.name == 'glMapNamedBufferEXT': + print r' glGetNamedBufferParameterivEXT(buffer, GL_BUFFER_SIZE, &length);' + else: + assert False + print r' retrace::addRegion(__address, __result, length);' + print r' }' + if function.name in self.unmap_function_names: + print r' GLvoid *ptr = NULL;' + if function.name == 'glUnmapBuffer': + print r' glGetBufferPointerv(target, GL_BUFFER_MAP_POINTER, &ptr);' + elif function.name == 'glUnmapBufferARB': + print r' glGetBufferPointervARB(target, GL_BUFFER_MAP_POINTER_ARB, &ptr);' + elif function.name == 'glUnmapNamedBufferEXT': + print r' glGetNamedBufferPointervEXT(buffer, GL_BUFFER_MAP_POINTER, &ptr);' + else: + assert False + print r' if (ptr) {' + print r' retrace::delRegionByPointer(ptr);' + print r' }' + def extract_arg(self, function, arg, arg_type, lvalue, rvalue): if function.name in self.array_pointer_function_names and arg.name == 'pointer': - print ' %s = static_cast<%s>(%s.toPointer(true));' % (lvalue, arg_type, rvalue) + print ' %s = static_cast<%s>(retrace::toPointer(%s, true));' % (lvalue, arg_type, rvalue) return if function.name in self.draw_elements_function_names and arg.name == 'indices' or\ @@ -356,6 +396,6 @@ if __name__ == '__main__': ''' api = glapi.glapi - api.add_function(glapi.memcpy) + api.add_api(glesapi.glesapi) retracer = GlRetracer() retracer.retrace_api(api)