X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glretrace.py;h=b6dac924ef5b4e350f2ee0321c81fae96696eb15;hb=1a9f7af32205d900c88fef0b544546eb0d7c84ee;hp=72931b51bc4c9dde53638fb37231d5d6a586f0df;hpb=ac5285bdd7fde00f9d35810ac5cde555dc4fbdf1;p=apitrace diff --git a/glretrace.py b/glretrace.py index 72931b5..b6dac92 100644 --- a/glretrace.py +++ b/glretrace.py @@ -93,16 +93,58 @@ class GlRetracer(Retracer): "glDrawRangeElements", "glDrawRangeElementsBaseVertex", "glDrawRangeElementsEXT", - #"glMultiDrawElements", - #"glMultiDrawElementsBaseVertex", - #"glMultiDrawElementsEXT", - #"glMultiModeDrawElementsIBM", + "glMultiDrawElements", + "glMultiDrawElementsBaseVertex", + "glMultiDrawElementsEXT", + "glMultiModeDrawElementsIBM", + ]) + + misc_draw_function_names = set([ + "glClear", + "glEnd", + "glDrawPixels", + "glBlitFramebuffer", + "glBlitFramebufferEXT", + ]) + + bind_framebuffer_function_names = set([ + "glBindFramebuffer", + "glBindFramebufferARB", + "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 is_draw_elements = function.name in self.draw_elements_function_names + is_misc_draw = function.name in self.misc_draw_function_names if is_array_pointer or is_draw_array or is_draw_elements: print ' if (glretrace::parser.version < 1) {' @@ -123,51 +165,179 @@ 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) - def call_function(self, function): - if function.name == "glViewport": - print ' bool reshape_window = false;' - print ' if (x + width > glretrace::window_width) {' - print ' glretrace::window_width = x + width;' - print ' reshape_window = true;' + # Post-snapshots + if function.name in ('glFlush', 'glFinish'): + print ' if (!glretrace::double_buffer) {' + print ' glretrace::frame_complete(call.no);' print ' }' - print ' if (y + height > glretrace::window_height) {' - print ' glretrace::window_height = y + height;' - print ' reshape_window = true;' + 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);' print ' }' - print ' if (reshape_window) {' - print ' // XXX: does not always work' - print ' glretrace::drawable->resize(glretrace::window_width, glretrace::window_height);' - print ' reshape_window = false;' + + + def call_function(self, function): + 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 ' }' if function.name == "glEnd": print ' glretrace::insideGlBeginEnd = false;' + + if function.name == 'memcpy': + print ' if (!dest || !src || !n) return;' Retracer.call_function(self, function) + # Error checking if function.name == "glBegin": print ' glretrace::insideGlBeginEnd = true;' - else: + elif function.name.startswith('gl'): # glGetError is not allowed inside glBegin/glEnd - print ' glretrace::checkGlError(call.no);' + print ' if (!glretrace::benchmark && !glretrace::insideGlBeginEnd) {' + print ' glretrace::checkGlError(call);' + if function.name in ('glProgramStringARB', 'glProgramStringNV'): + print r' GLint error_position = -1;' + 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' }' + if function.name == 'glCompileShader': + print r' GLint compile_status = 0;' + print r' glGetShaderiv(shader, GL_COMPILE_STATUS, &compile_status);' + print r' if (!compile_status) {' + print r' GLint info_log_length = 0;' + 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' delete [] infoLog;' + print r' }' + if function.name == 'glLinkProgram': + print r' GLint link_status = 0;' + print r' glGetProgramiv(program, GL_LINK_STATUS, &link_status);' + print r' if (!link_status) {' + print r' GLint info_log_length = 0;' + 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' delete [] infoLog;' + print r' }' + if function.name == 'glCompileShaderARB': + print r' GLint compile_status = 0;' + print r' glGetObjectParameterivARB(shaderObj, GL_OBJECT_COMPILE_STATUS_ARB, &compile_status);' + print r' if (!compile_status) {' + print r' GLint info_log_length = 0;' + 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' delete [] infoLog;' + print r' }' + if function.name == 'glLinkProgramARB': + print r' GLint link_status = 0;' + print r' glGetObjectParameterivARB(programObj, GL_OBJECT_LINK_STATUS_ARB, &link_status);' + print r' if (!link_status) {' + print r' GLint info_log_length = 0;' + 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' 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' }' + 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' }' + 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 << ": incomplete framebuffer (" << __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.blob());' % (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': - print ' %s = %s.blob();' % (lvalue, rvalue) + self.extract_opaque_arg(function, arg, arg_type, lvalue, rvalue) + return + + # 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 - if function.name.startswith('glUniform') and function.args[0].name == arg.name == 'location': + if arg.type is glapi.GLlocation \ + and 'program' not in [arg.name for arg in function.args]: print ' GLint program = -1;' print ' glGetIntegerv(GL_CURRENT_PROGRAM, &program);' + + if arg.type is glapi.GLlocationARB \ + and 'programObj' not in [arg.name for arg in function.args]: + print ' GLhandleARB programObj = glGetHandleARB(GL_PROGRAM_OBJECT_ARB);' Retracer.extract_arg(self, function, arg, arg_type, lvalue, rvalue) + # Don't try to use more samples than the implementation supports + if arg.name == 'samples': + assert arg.type is glapi.GLsizei + print ' GLint max_samples = 0;' + print ' glGetIntegerv(GL_MAX_SAMPLES, &max_samples);' + print ' if (samples > max_samples) {' + print ' samples = max_samples;' + print ' }' + if __name__ == '__main__': print r''' @@ -181,4 +351,4 @@ if __name__ == '__main__': api = glapi.glapi api.add_function(glapi.memcpy) retracer = GlRetracer() - retracer.retrace_api(glapi.glapi) + retracer.retrace_api(api)