// Additional extensions to be advertised
-static const char *extra_extensions[] = {
+static const char *
+extraExtension_stringsFull[] = {
"GL_GREMEDY_string_marker",
"GL_GREMEDY_frame_terminator",
};
-#define NUM_EXTRA_EXTENSIONS (sizeof(extra_extensions)/sizeof(extra_extensions[0]))
+
+static const char *
+extraExtension_stringsES[] = {
+ "GL_EXT_debug_marker",
+};
+
+// Description of additional extensions we want to advertise
+struct ExtensionsDesc
+{
+ unsigned numStrings;
+ const char **strings;
+};
+
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
+
+const struct ExtensionsDesc
+extraExtensionsFull = {
+ ARRAY_SIZE(extraExtension_stringsFull),
+ extraExtension_stringsFull
+};
+
+const struct ExtensionsDesc
+extraExtensionsES = {
+ ARRAY_SIZE(extraExtension_stringsES),
+ extraExtension_stringsES
+};
+
+
+const struct ExtensionsDesc *
+getExtraExtensions(void)
+{
+ Context *ctx = getContext();
+
+ switch (ctx->profile) {
+ case PROFILE_COMPAT:
+ return &extraExtensionsFull;
+ case PROFILE_ES1:
+ case PROFILE_ES2:
+ return &extraExtensionsES;
+ default:
+ assert(0);
+ return &extraExtensionsFull;
+ }
+}
/**
static const char *
overrideExtensionsString(const char *extensions)
{
+ const ExtensionsDesc *desc = getExtraExtensions();
size_t i;
ExtensionsMap::const_iterator it = extensionsMap.find(extensions);
return it->second;
}
- size_t extensions_len = strlen(extensions);
+ size_t extensionsLen = strlen(extensions);
- size_t extra_extensions_len = 0;
- for (i = 0; i < NUM_EXTRA_EXTENSIONS; ++i) {
- const char * extra_extension = extra_extensions[i];
- size_t extra_extension_len = strlen(extra_extension);
- extra_extensions_len += extra_extension_len + 1;
+ size_t extraExtensionsLen = 0;
+ for (i = 0; i < desc->numStrings; ++i) {
+ const char * extraExtension = desc->strings[i];
+ size_t extraExtensionLen = strlen(extraExtension);
+ extraExtensionsLen += extraExtensionLen + 1;
}
// We use malloc memory instead of a std::string because we need to ensure
// that extensions strings will not move in memory as the extensionsMap is
// updated.
- size_t new_extensions_len = extensions_len + 1 + extra_extensions_len + 1;
- char *new_extensions = (char *)malloc(new_extensions_len);
- if (!new_extensions) {
+ size_t newExtensionsLen = extensionsLen + 1 + extraExtensionsLen + 1;
+ char *newExtensions = (char *)malloc(newExtensionsLen);
+ if (!newExtensions) {
return extensions;
}
- if (extensions_len) {
- memcpy(new_extensions, extensions, extensions_len);
+ if (extensionsLen) {
+ memcpy(newExtensions, extensions, extensionsLen);
// Add space separator if necessary
- if (new_extensions[extensions_len - 1] != ' ') {
- new_extensions[extensions_len++] = ' ';
+ if (newExtensions[extensionsLen - 1] != ' ') {
+ newExtensions[extensionsLen++] = ' ';
}
}
- for (i = 0; i < NUM_EXTRA_EXTENSIONS; ++i) {
- const char * extra_extension = extra_extensions[i];
- size_t extra_extension_len = strlen(extra_extension);
- memcpy(new_extensions + extensions_len, extra_extension, extra_extension_len);
- extensions_len += extra_extension_len;
- new_extensions[extensions_len++] = ' ';
+ for (i = 0; i < desc->numStrings; ++i) {
+ const char * extraExtension = desc->strings[i];
+ size_t extraExtensionLen = strlen(extraExtension);
+ memcpy(newExtensions + extensionsLen, extraExtension, extraExtensionLen);
+ extensionsLen += extraExtensionLen;
+ newExtensions[extensionsLen++] = ' ';
}
- new_extensions[extensions_len++] = '\0';
- assert(extensions_len <= new_extensions_len);
+ newExtensions[extensionsLen++] = '\0';
+ assert(extensionsLen <= newExtensionsLen);
- extensionsMap[extensions] = new_extensions;
+ extensionsMap[extensions] = newExtensions;
- return new_extensions;
+ return newExtensions;
}
if (params) {
switch (pname) {
case GL_NUM_EXTENSIONS:
- *params += NUM_EXTRA_EXTENSIONS;
+ {
+ const ExtensionsDesc *desc = getExtraExtensions();
+ *params += desc->numStrings;
+ }
break;
default:
break;
switch (name) {
case GL_EXTENSIONS:
{
- GLint num_extensions = 0;
- __glGetIntegerv(GL_NUM_EXTENSIONS, &num_extensions);
- if ((GLuint)num_extensions <= index && index < (GLuint)num_extensions + NUM_EXTRA_EXTENSIONS) {
- return (const GLubyte *)extra_extensions[index - (GLuint)num_extensions];
+ const ExtensionsDesc *desc = getExtraExtensions();
+ GLint numExtensions = 0;
+ __glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
+ if ((GLuint)numExtensions <= index && index < (GLuint)numExtensions + desc->numStrings) {
+ return (const GLubyte *)desc->strings[index - (GLuint)numExtensions];
}
}
break;
print '#include "gltrace.hpp"'
print
- print 'enum tracer_context_profile {'
- print ' PROFILE_COMPAT,'
- print ' PROFILE_ES1,'
- print ' PROFILE_ES2,'
- print '};'
- print
- print 'struct tracer_context {'
- print ' enum tracer_context_profile profile;'
- print ' bool user_arrays;'
- print ' bool user_arrays_arb;'
- print ' bool user_arrays_nv;'
- print '};'
- print
# Which glVertexAttrib* variant to use
print 'enum vertex_attrib {'
print ' VERTEX_ATTRIB_NV,'
print '};'
print
- print 'static tracer_context *__get_context(void)'
+ print 'gltrace::Context *'
+ print 'gltrace::getContext(void)'
print '{'
print ' // TODO return the context set by other APIs (GLX, EGL, and etc.)'
- print ' static tracer_context __ctx = { PROFILE_COMPAT, false, false, false };'
+ print ' static gltrace::Context __ctx = { gltrace::PROFILE_COMPAT, false, false, false };'
print ' return &__ctx;'
print '}'
print
print 'static vertex_attrib __get_vertex_attrib(void) {'
- print ' tracer_context *ctx = __get_context();'
+ print ' gltrace::Context *ctx = gltrace::getContext();'
print ' if (ctx->user_arrays_arb || ctx->user_arrays_nv) {'
print ' GLboolean __vertex_program = GL_FALSE;'
print ' __glGetBooleanv(GL_VERTEX_PROGRAM_ARB, &__vertex_program);'
# Whether we need user arrays
print 'static inline bool __need_user_arrays(void)'
print '{'
- print ' tracer_context *ctx = __get_context();'
+ print ' gltrace::Context *ctx = gltrace::getContext();'
print ' if (!ctx->user_arrays) {'
print ' return false;'
print ' }'
for camelcase_name, uppercase_name in self.arrays:
# in which profile is the array available?
- profile_check = 'ctx->profile == PROFILE_COMPAT'
+ profile_check = 'ctx->profile == gltrace::PROFILE_COMPAT'
if camelcase_name in self.arrays_es1:
- profile_check = '(' + profile_check + ' || ctx->profile == PROFILE_ES1)';
+ profile_check = '(' + profile_check + ' || ctx->profile == gltrace::PROFILE_ES1)';
function_name = 'gl%sPointer' % camelcase_name
enable_name = 'GL_%s_ARRAY' % uppercase_name
print
print ' // ES1 does not support generic vertex attributes'
- print ' if (ctx->profile == PROFILE_ES1)'
+ print ' if (ctx->profile == gltrace::PROFILE_ES1)'
print ' return false;'
print
print ' vertex_attrib __vertex_attrib = __get_vertex_attrib();'
# states such as GL_UNPACK_ROW_LENGTH are not available in GLES
print 'static inline bool'
print 'can_unpack_subimage(void) {'
- print ' tracer_context *ctx = __get_context();'
- print ' return (ctx->profile == PROFILE_COMPAT);'
+ print ' gltrace::Context *ctx = gltrace::getContext();'
+ print ' return (ctx->profile == gltrace::PROFILE_COMPAT);'
print '}'
print
print ' GLint __array_buffer = 0;'
print ' __glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &__array_buffer);'
print ' if (!__array_buffer) {'
- print ' tracer_context *ctx = __get_context();'
+ print ' gltrace::Context *ctx = gltrace::getContext();'
print ' ctx->user_arrays = true;'
if function.name == "glVertexAttribPointerARB":
print ' ctx->user_arrays_arb = true;'
Tracer.traceFunctionImplBody(self, function)
- gremedy_functions = [
+ marker_functions = [
+ # GL_GREMEDY_string_marker
'glStringMarkerGREMEDY',
+ # GL_GREMEDY_frame_terminator
'glFrameTerminatorGREMEDY',
+ # GL_EXT_debug_marker
+ 'glInsertEventMarkerEXT',
+ 'glPushGroupMarkerEXT',
+ 'glPopGroupMarkerEXT',
]
def invokeFunction(self, function):
# These functions have been dispatched already
return
- # We implement the GREMEDY extensions, not the driver
- if function.name in self.gremedy_functions:
+ # We implement GL_EXT_debug_marker, GL_GREMEDY_*, etc., and not the
+ # driver
+ if function.name in self.marker_functions:
return
if function.name in ('glXGetProcAddress', 'glXGetProcAddressARB', 'wglGetProcAddress'):
- if_ = 'if'
- for gremedy_function in self.gremedy_functions:
- print ' %s (strcmp("%s", (const char *)%s) == 0) {' % (if_, gremedy_function, function.args[0].name)
- print ' __result = (%s)&%s;' % (function.type, gremedy_function)
- print ' }'
- if_ = 'else if'
- print ' else {'
+ else_ = ''
+ for marker_function in self.marker_functions:
+ if self.api.get_function_by_name(marker_function):
+ print ' %sif (strcmp("%s", (const char *)%s) == 0) {' % (else_, marker_function, function.args[0].name)
+ print ' __result = (%s)&%s;' % (function.type, marker_function)
+ print ' }'
+ else_ = 'else '
+ print ' %s{' % else_
Tracer.invokeFunction(self, function)
print ' }'
return
or (isinstance(arg.type, stdapi.Const) \
and isinstance(arg.type.type, stdapi.Blob))):
print ' {'
- print ' tracer_context *ctx = __get_context();'
+ print ' gltrace::Context *ctx = gltrace::getContext();'
print ' GLint __unpack_buffer = 0;'
- print ' if (ctx->profile == PROFILE_COMPAT)'
+ print ' if (ctx->profile == gltrace::PROFILE_COMPAT)'
print ' __glGetIntegerv(GL_PIXEL_UNPACK_BUFFER_BINDING, &__unpack_buffer);'
print ' if (__unpack_buffer) {'
print ' trace::localWriter.writeOpaque(%s);' % arg.name
# update the state
print 'static void __trace_user_arrays(GLuint maxindex)'
print '{'
- print ' tracer_context *ctx = __get_context();'
+ print ' gltrace::Context *ctx = gltrace::getContext();'
for camelcase_name, uppercase_name in self.arrays:
# in which profile is the array available?
- profile_check = 'ctx->profile == PROFILE_COMPAT'
+ profile_check = 'ctx->profile == gltrace::PROFILE_COMPAT'
if camelcase_name in self.arrays_es1:
- profile_check = '(' + profile_check + ' || ctx->profile == PROFILE_ES1)';
+ profile_check = '(' + profile_check + ' || ctx->profile == gltrace::PROFILE_ES1)';
function_name = 'gl%sPointer' % camelcase_name
enable_name = 'GL_%s_ARRAY' % uppercase_name
# alias, and they need to be considered independently.
#
print ' // ES1 does not support generic vertex attributes'
- print ' if (ctx->profile == PROFILE_ES1)'
+ print ' if (ctx->profile == gltrace::PROFILE_ES1)'
print ' return;'
print
print ' vertex_attrib __vertex_attrib = __get_vertex_attrib();'
print ' GLint client_active_texture = 0;'
print ' __glGetIntegerv(GL_CLIENT_ACTIVE_TEXTURE, &client_active_texture);'
print ' GLint max_texture_coords = 0;'
- print ' if (ctx->profile == PROFILE_COMPAT)'
+ print ' if (ctx->profile == gltrace::PROFILE_COMPAT)'
print ' __glGetIntegerv(GL_MAX_TEXTURE_COORDS, &max_texture_coords);'
print ' else'
print ' __glGetIntegerv(GL_MAX_TEXTURE_UNITS, &max_texture_coords);'
projects / apitrace / commitdiff