snapdiff: Provide indication whether images match or not

[apitrace] / glcaps.cpp

diff --git a/glcaps.cpp b/glcaps.cpp
index 51a59545754047aecb15b12fb5035637736844f0..f6f70f32c03236c9a6b6a699b8ee6fa48b659e15 100644 (file)
--- a/glcaps.cpp
+++ b/glcaps.cpp
@@ -24,12 +24,22 @@
  **************************************************************************/
 
 
+/*
+ * Manipulation of GL extensions.
+ *
+ * So far we insert GREMEDY extensions, but in the future we could also clamp
+ * the GL extensions to core GL versions here.
+ */
+
+
+#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 
 #include <string>
 #include <map>
 
+#include "glproc.hpp"
 #include "gltrace.hpp"
 
 
@@ -43,44 +53,172 @@ static ExtensionsMap extensionsMap;
 
 
 // Additional extensions to be advertised
-const char extra_extensions[] =
-    "GL_GREMEDY_string_marker "
-    "GL_GREMEDY_frame_terminator "
-;
+static const char *
+extraExtension_stringsFull[] = {
+    "GL_GREMEDY_string_marker",
+    "GL_GREMEDY_frame_terminator",
+};
+
+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;
+    }
+}
 
 
 /**
  * Translate the GL extensions string, adding new extensions.
  */
-const char *
-translateExtensionsString(const char *extensions)
+static const char *
+overrideExtensionsString(const char *extensions)
 {
+    const ExtensionsDesc *desc = getExtraExtensions();
+    size_t i;
+
     ExtensionsMap::const_iterator it = extensionsMap.find(extensions);
     if (it != extensionsMap.end()) {
         return it->second;
     }
 
-    size_t extensions_len = strlen(extensions);
+    size_t extensionsLen = strlen(extensions);
 
-    char *new_extensions = (char *)malloc(extensions_len + 1 + sizeof extra_extensions);
-    if (!new_extensions) {
+    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 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++] = ' ';
         }
     }
 
-    memcpy(new_extensions + extensions_len, extra_extensions, sizeof extra_extensions);
+    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++] = ' ';
+    }
+    newExtensions[extensionsLen++] = '\0';
+    assert(extensionsLen <= newExtensionsLen);
+
+    extensionsMap[extensions] = newExtensions;
 
-    extensionsMap[extensions] = new_extensions;
+    return newExtensions;
+}
+
+
+const GLubyte *
+__glGetString_override(GLenum name)
+{
+    const GLubyte *result = __glGetString(name);
+
+    if (result) {
+        switch (name) {
+        case GL_EXTENSIONS:
+            result = (const GLubyte *)overrideExtensionsString((const char *)result);
+            break;
+        default:
+            break;
+        }
+    }
+
+    return result;
+}
+
+
+void
+__glGetIntegerv_override(GLenum pname, GLint *params)
+{
+    __glGetIntegerv(pname, params);
+
+    if (params) {
+        switch (pname) {
+        case GL_NUM_EXTENSIONS:
+            {
+                const ExtensionsDesc *desc = getExtraExtensions();
+                *params += desc->numStrings;
+            }
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+
+const GLubyte *
+__glGetStringi_override(GLenum name, GLuint index)
+{
+    switch (name) {
+    case GL_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;
+    default:
+        break;
+    }
 
-    return new_extensions;
+    return __glGetStringi(name, index);
 }