X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glretrace.py;h=2eb6f4abe1a4eea3dcc5c27f96305ecc19ed348b;hb=31f2b6e1f6427e1086fcccf74f6f436700097f1f;hp=0cb8972d5a48c09d935bfbaefb88f2400b92726a;hpb=fd34e4ee3ffdcb4276e89666e62a007131f654ed;p=apitrace diff --git a/glretrace.py b/glretrace.py index 0cb8972..2eb6f4a 100644 --- a/glretrace.py +++ b/glretrace.py @@ -27,13 +27,15 @@ """GL retracer generator.""" -import stdapi -import glapi +import specs.stdapi as stdapi +import specs.glapi as glapi from retrace import Retracer class GlRetracer(Retracer): + table_name = 'glretrace::gl_callbacks' + def retrace_function(self, function): Retracer.retrace_function(self, function) @@ -76,6 +78,7 @@ class GlRetracer(Retracer): "glDrawArraysInstanced", "glDrawArraysInstancedARB", "glDrawArraysInstancedEXT", + "glDrawArraysInstancedBaseInstance", "glDrawMeshArraysSUN", "glMultiDrawArrays", "glMultiDrawArraysEXT", @@ -88,20 +91,30 @@ class GlRetracer(Retracer): "glDrawElementsIndirect", "glDrawElementsInstanced", "glDrawElementsInstancedARB", - "glDrawElementsInstancedBaseVertex", "glDrawElementsInstancedEXT", + "glDrawElementsInstancedBaseVertex", + "glDrawElementsInstancedBaseInstance", + "glDrawElementsInstancedBaseVertexBaseInstance", "glDrawRangeElements", - "glDrawRangeElementsBaseVertex", "glDrawRangeElementsEXT", + "glDrawRangeElementsBaseVertex", "glMultiDrawElements", "glMultiDrawElementsBaseVertex", "glMultiDrawElementsEXT", "glMultiModeDrawElementsIBM", ]) + draw_indirect_function_names = set([ + "glDrawArraysIndirect", + "glDrawElementsIndirect", + ]) + misc_draw_function_names = set([ "glClear", "glEnd", + "glDrawPixels", + "glBlitFramebuffer", + "glBlitFramebufferEXT", ]) bind_framebuffer_function_names = set([ @@ -110,6 +123,33 @@ class GlRetracer(Retracer): "glBindFramebufferEXT", ]) + # Names of the functions that can pack into the current pixel buffer + # object. See also the ARB_pixel_buffer_object specification. + pack_function_names = set([ + 'glGetCompressedTexImage', + 'glGetConvolutionFilter', + 'glGetHistogram', + 'glGetMinmax', + 'glGetPixelMapfv', + 'glGetPixelMapuiv', + 'glGetPixelMapusv', + 'glGetPolygonStipple', + 'glGetSeparableFilter', + 'glGetTexImage', + 'glReadPixels', + 'glGetnCompressedTexImageARB', + 'glGetnConvolutionFilterARB', + 'glGetnHistogramARB', + 'glGetnMinmaxARB', + 'glGetnPixelMapfvARB', + 'glGetnPixelMapuivARB', + 'glGetnPixelMapusvARB', + 'glGetnPolygonStippleARB', + 'glGetnSeparableFilterARB', + 'glGetnTexImageARB', + 'glReadnPixelsARB', + ]) + 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 @@ -135,11 +175,28 @@ class GlRetracer(Retracer): print ' }' + # When no pack buffer object is bound, the pack functions are no-ops. + if function.name in self.pack_function_names: + print ' GLint __pack_buffer = 0;' + print ' glGetIntegerv(GL_PIXEL_PACK_BUFFER_BINDING, &__pack_buffer);' + print ' if (!__pack_buffer) {' + if function.name == 'glReadPixels': + print ' glFinish();' + print ' if (glretrace::snapshot_frequency == glretrace::FREQUENCY_FRAME ||' + print ' glretrace::snapshot_frequency == glretrace::FREQUENCY_FRAMEBUFFER) {' + print ' glretrace::snapshot(call.no);' + print ' }' + print ' return;' + print ' }' + # Pre-snapshots if function.name in self.bind_framebuffer_function_names: print ' if (glretrace::snapshot_frequency == glretrace::FREQUENCY_FRAMEBUFFER) {' print ' glretrace::snapshot(call.no - 1);' print ' }' + if function.name == 'glFrameTerminatorGREMEDY': + print ' glretrace::frame_complete(call.no);' + return Retracer.retrace_function_body(self, function) @@ -148,12 +205,6 @@ class GlRetracer(Retracer): print ' if (!glretrace::double_buffer) {' print ' glretrace::frame_complete(call.no);' print ' }' - if function.name == 'glReadPixels': - print ' glFinish();' - print ' if (glretrace::snapshot_frequency == glretrace::FREQUENCY_FRAME ||' - print ' glretrace::snapshot_frequency == glretrace::FREQUENCY_FRAMEBUFFER) {' - print ' glretrace::snapshot(call.no);' - print ' }' if is_draw_array or is_draw_elements or is_misc_draw: print ' if (glretrace::snapshot_frequency == glretrace::FREQUENCY_DRAW) {' print ' glretrace::snapshot(call.no);' @@ -161,19 +212,13 @@ class GlRetracer(Retracer): def call_function(self, function): + # Infer the drawable size from GL calls if function.name == "glViewport": - 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 ' 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;' @@ -195,7 +240,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;' @@ -205,7 +250,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': @@ -216,7 +261,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': @@ -227,7 +272,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': @@ -238,26 +283,39 @@ 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'): 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' retrace::warning(call) << "incomplete framebuffer (" << glstate::enumToString(__result) << ")\n";' print r' }' print ' }' 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());' % (lvalue, arg_type, rvalue) + print ' %s = static_cast<%s>(%s.toPointer(true));' % (lvalue, arg_type, rvalue) + return + + if function.name in self.draw_elements_function_names and arg.name == 'indices' or\ + function.name in self.draw_indirect_function_names and arg.name == 'indirect': + self.extract_opaque_arg(function, arg, arg_type, lvalue, rvalue) return - if function.name in self.draw_elements_function_names and arg.name == 'indices': + # Handle pointer with offsets into the current pack pixel buffer + # object. + if function.name in self.pack_function_names and arg.output: self.extract_opaque_arg(function, arg, arg_type, lvalue, rvalue) return @@ -288,6 +346,7 @@ if __name__ == '__main__': #include "glproc.hpp" #include "glretrace.hpp" +#include "glstate.hpp" '''