From f1c95ba83a611d339e42c345c44687e533989430 Mon Sep 17 00:00:00 2001 From: Ricardo Garcia Date: Thu, 12 Jan 2023 13:37:06 +0100 Subject: [PATCH] Fix debug callback function prototypes Some recent changes to the GLDEBUGPROC declaration in glwTypes.inl broke the build in some systems. No test results should be affected by these changes. Components: Framework, OpenGL, AOSP VK-GL-CTS issue: 4216 Change-Id: I937c47015e914876464de8915bc45981e2ff5309 --- external/fetch_kc_cts.py | 2 +- external/openglcts/modules/common/glcKHRDebugTests.cpp | 4 ++-- external/openglcts/modules/common/glcKHRDebugTests.hpp | 4 ++-- framework/opengl/wrapper/glwTypes.inl | 2 +- modules/gles31/functional/es31fDebugTests.cpp | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/external/fetch_kc_cts.py b/external/fetch_kc_cts.py index 1d1fb57..fb797f6 100644 --- a/external/fetch_kc_cts.py +++ b/external/fetch_kc_cts.py @@ -32,7 +32,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts")) from ctsbuild.common import * EXTERNAL_DIR = os.path.realpath(os.path.normpath(os.path.dirname(__file__))) -SHA1 = "3059c07a20ac64f636296a7ef200dadc1ce7d37a" +SHA1 = "3e256baab38a1c29d753fa4605f507aee8684d84" PACKAGES = [ GitRepo( diff --git a/external/openglcts/modules/common/glcKHRDebugTests.cpp b/external/openglcts/modules/common/glcKHRDebugTests.cpp index 8da51b2..efad8c4 100644 --- a/external/openglcts/modules/common/glcKHRDebugTests.cpp +++ b/external/openglcts/modules/common/glcKHRDebugTests.cpp @@ -1797,7 +1797,7 @@ tcu::TestNode::IterateResult ReceivingMessagesTest::iterate() **/ void ReceivingMessagesTest::debug_proc(glw::GLenum /* source */, glw::GLenum /* type */, glw::GLuint /* id */, glw::GLenum /* severity */, glw::GLsizei /* length */, - const glw::GLchar* /* message */, void* info) + const glw::GLchar* /* message */, const void* info) { GLuint* counter = (GLuint*)info; @@ -2403,7 +2403,7 @@ SynchronousCallsTest::~SynchronousCallsTest(void) **/ void SynchronousCallsTest::debug_proc(glw::GLenum /* source */, glw::GLenum /* type */, glw::GLuint /* id */, glw::GLenum /* severity */, glw::GLsizei /* length */, - const glw::GLchar* /* message */, void* info) + const glw::GLchar* /* message */, const void* info) { int* callback_executed = (int*)info; diff --git a/external/openglcts/modules/common/glcKHRDebugTests.hpp b/external/openglcts/modules/common/glcKHRDebugTests.hpp index b4d0b65..cce0c5a 100644 --- a/external/openglcts/modules/common/glcKHRDebugTests.hpp +++ b/external/openglcts/modules/common/glcKHRDebugTests.hpp @@ -318,7 +318,7 @@ public: private: /* Private routines */ static void GLW_APIENTRY debug_proc(glw::GLenum source, glw::GLenum type, glw::GLuint id, glw::GLenum severity, - glw::GLsizei length, const glw::GLchar* message, void* info); + glw::GLsizei length, const glw::GLchar* message, const void* info); void inspectCallbackCounter(glw::GLuint& callback_counter, glw::GLuint expected_number_of_messages) const; @@ -446,7 +446,7 @@ public: private: /* Private routines */ static void GLW_APIENTRY debug_proc(glw::GLenum source, glw::GLenum type, glw::GLuint id, glw::GLenum severity, - glw::GLsizei length, const glw::GLchar* message, void* info); + glw::GLsizei length, const glw::GLchar* message, const void* info); de::ThreadLocal m_tls; deUint32 m_uid; diff --git a/framework/opengl/wrapper/glwTypes.inl b/framework/opengl/wrapper/glwTypes.inl index 76d3d1a..eb40825 100644 --- a/framework/opengl/wrapper/glwTypes.inl +++ b/framework/opengl/wrapper/glwTypes.inl @@ -83,7 +83,7 @@ typedef struct __GLsync* GLsync; typedef void* GLeglImageOES; /* Callback for GL_ARB_debug_output. */ -typedef void (GLW_APIENTRY* GLDEBUGPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, GLvoid *userParam); +typedef void (GLW_APIENTRY* GLDEBUGPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const GLvoid *userParam); /* OES_EGL_image */ typedef void* GLeglImageOES; diff --git a/modules/gles31/functional/es31fDebugTests.cpp b/modules/gles31/functional/es31fDebugTests.cpp index 9f8e03b..f0dbc9f 100644 --- a/modules/gles31/functional/es31fDebugTests.cpp +++ b/modules/gles31/functional/es31fDebugTests.cpp @@ -310,7 +310,7 @@ struct MessageData MessageData (const MessageID& id_, GLenum severity_, const string& message_) : id(id_) , severity(severity_) , message(message_) {} }; -extern "C" typedef void GLW_APIENTRY DebugCallbackFunc(GLenum, GLenum, GLuint, GLenum, GLsizei, const char*, void*); +extern "C" typedef void GLW_APIENTRY DebugCallbackFunc(GLenum, GLenum, GLuint, GLenum, GLsizei, const char*, const void*); // Base class class BaseCase : public NegativeTestShared::ErrorCase @@ -356,7 +356,7 @@ protected: tcu::ResultCollector m_results; }; -void BaseCase::callbackHandle (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* message, void* userParam) +void BaseCase::callbackHandle (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* message, const void* userParam) { static_cast(const_cast(userParam))->callback(source, type, id, severity, string(message, &message[length])); } @@ -2804,7 +2804,7 @@ GroupStackDepthQueryCase::IterateResult GroupStackDepthQueryCase::iterate (void) return STOP; } -extern "C" void GLW_APIENTRY emptyCallback(GLenum, GLenum, GLuint, GLenum, GLsizei, const char*, void*) +extern "C" void GLW_APIENTRY emptyCallback(GLenum, GLenum, GLuint, GLenum, GLsizei, const char*, const void*) { // empty } -- 2.7.4