From d63ae63d1b9320d772185cdfb429b88e3ea7994c Mon Sep 17 00:00:00 2001 From: rogerman Date: Wed, 16 Jan 2019 15:46:13 -0800 Subject: [PATCH] OpenGL Renderer: Fix compiling for non-Cocoa ports. (Regression from commit c9db815.) --- desmume/src/OGLRender.h | 5 +++++ desmume/src/OGLRender_3_2.cpp | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/desmume/src/OGLRender.h b/desmume/src/OGLRender.h index 9f0bd70dd..2250d7496 100755 --- a/desmume/src/OGLRender.h +++ b/desmume/src/OGLRender.h @@ -274,6 +274,11 @@ EXTERNOGLEXT(PFNGLGETACTIVEUNIFORMBLOCKIVPROC, glGetActiveUniformBlockiv) // Cor // TBO EXTERNOGLEXT(PFNGLTEXBUFFERPROC, glTexBuffer) // Core in v3.1 +// Sync Objects +EXTERNOGLEXT(PFNGLFENCESYNCPROC, glFenceSync) // Core in v3.2 +EXTERNOGLEXT(PFNGLWAITSYNCPROC, glWaitSync) // Core in v3.2 +EXTERNOGLEXT(PFNGLDELETESYNCPROC, glDeleteSync) // Core in v3.2 + #endif // OGLRENDER_3_2_H // Define the minimum required OpenGL version for the driver to support diff --git a/desmume/src/OGLRender_3_2.cpp b/desmume/src/OGLRender_3_2.cpp index 5cdb3d899..44ac0bfcc 100755 --- a/desmume/src/OGLRender_3_2.cpp +++ b/desmume/src/OGLRender_3_2.cpp @@ -67,6 +67,11 @@ OGLEXT(PFNGLGETACTIVEUNIFORMBLOCKIVPROC, glGetActiveUniformBlockiv) // Core in v // TBO OGLEXT(PFNGLTEXBUFFERPROC, glTexBuffer) // Core in v3.1 +// Sync Objects +OGLEXT(PFNGLFENCESYNCPROC, glFenceSync) // Core in v3.2 +OGLEXT(PFNGLWAITSYNCPROC, glWaitSync) // Core in v3.2 +OGLEXT(PFNGLDELETESYNCPROC, glDeleteSync) // Core in v3.2 + void OGLLoadEntryPoints_3_2() { // Basic Functions @@ -103,6 +108,11 @@ void OGLLoadEntryPoints_3_2() // TBO INITOGLEXT(PFNGLTEXBUFFERPROC, glTexBuffer) + + // Sync Objects + INITOGLEXT(PFNGLFENCESYNCPROC, glFenceSync) // Core in v3.2 + INITOGLEXT(PFNGLWAITSYNCPROC, glWaitSync) // Core in v3.2 + INITOGLEXT(PFNGLDELETESYNCPROC, glDeleteSync) // Core in v3.2 } // Vertex shader for geometry, GLSL 1.50