From 629da9c8e25d7025cc72b38daafc3efcac7b27a1 Mon Sep 17 00:00:00 2001 From: rogerman Date: Fri, 24 Apr 2015 09:00:54 +0000 Subject: [PATCH] OpenGL Renderer: - Fix compiling for platforms that aren't OS X. (Regression from r5166.) --- desmume/src/OGLRender.cpp | 4 ++++ desmume/src/OGLRender.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp index 9c431cc7e..83ed66c8e 100644 --- a/desmume/src/OGLRender.cpp +++ b/desmume/src/OGLRender.cpp @@ -111,7 +111,9 @@ OGLEXT(PFNGLGETUNIFORMLOCATIONPROC, glGetUniformLocation) // Core in v2.0 OGLEXT(PFNGLUNIFORM1IPROC, glUniform1i) // Core in v2.0 OGLEXT(PFNGLUNIFORM1IVPROC, glUniform1iv) // Core in v2.0 OGLEXT(PFNGLUNIFORM1FPROC, glUniform1f) // Core in v2.0 +OGLEXT(PFNGLUNIFORM1FVPROC, glUniform1fv) // Core in v2.0 OGLEXT(PFNGLUNIFORM2FPROC, glUniform2f) // Core in v2.0 +OGLEXT(PFNGLUNIFORM4FPROC, glUniform4f) // Core in v2.0 OGLEXT(PFNGLDRAWBUFFERSPROC, glDrawBuffers) // Core in v2.0 OGLEXT(PFNGLBINDATTRIBLOCATIONPROC, glBindAttribLocation) // Core in v2.0 OGLEXT(PFNGLENABLEVERTEXATTRIBARRAYPROC, glEnableVertexAttribArray) // Core in v2.0 @@ -189,7 +191,9 @@ static void OGLLoadEntryPoints_Legacy() INITOGLEXT(PFNGLUNIFORM1IPROC, glUniform1i) // Core in v2.0 INITOGLEXT(PFNGLUNIFORM1IVPROC, glUniform1iv) // Core in v2.0 INITOGLEXT(PFNGLUNIFORM1FPROC, glUniform1f) // Core in v2.0 + INITOGLEXT(PFNGLUNIFORM1FVPROC, glUniform1fv) // Core in v2.0 INITOGLEXT(PFNGLUNIFORM2FPROC, glUniform2f) // Core in v2.0 + INITOGLEXT(PFNGLUNIFORM4FPROC, glUniform4f) // Core in v2.0 INITOGLEXT(PFNGLDRAWBUFFERSPROC, glDrawBuffers) // Core in v2.0 INITOGLEXT(PFNGLBINDATTRIBLOCATIONPROC, glBindAttribLocation) // Core in v2.0 INITOGLEXT(PFNGLENABLEVERTEXATTRIBARRAYPROC, glEnableVertexAttribArray) // Core in v2.0 diff --git a/desmume/src/OGLRender.h b/desmume/src/OGLRender.h index 1a4e75de4..de94d8234 100644 --- a/desmume/src/OGLRender.h +++ b/desmume/src/OGLRender.h @@ -130,7 +130,9 @@ EXTERNOGLEXT(PFNGLGETUNIFORMLOCATIONPROC, glGetUniformLocation) // Core in v2.0 EXTERNOGLEXT(PFNGLUNIFORM1IPROC, glUniform1i) // Core in v2.0 EXTERNOGLEXT(PFNGLUNIFORM1IVPROC, glUniform1iv) // Core in v2.0 EXTERNOGLEXT(PFNGLUNIFORM1FPROC, glUniform1f) // Core in v2.0 +EXTERNOGLEXT(PFNGLUNIFORM1FVPROC, glUniform1fv) // Core in v2.0 EXTERNOGLEXT(PFNGLUNIFORM2FPROC, glUniform2f) // Core in v2.0 +EXTERNOGLEXT(PFNGLUNIFORM4FPROC, glUniform4f) // Core in v2.0 EXTERNOGLEXT(PFNGLDRAWBUFFERSPROC, glDrawBuffers) // Core in v2.0 // Generic vertex attributes @@ -211,7 +213,9 @@ EXTERNOGLEXT(PFNGLGETUNIFORMLOCATIONPROC, glGetUniformLocation) // Core in v2.0 EXTERNOGLEXT(PFNGLUNIFORM1IPROC, glUniform1i) // Core in v2.0 EXTERNOGLEXT(PFNGLUNIFORM1IVPROC, glUniform1iv) // Core in v2.0 EXTERNOGLEXT(PFNGLUNIFORM1FPROC, glUniform1f) // Core in v2.0 +EXTERNOGLEXT(PFNGLUNIFORM1FVPROC, glUniform1fv) // Core in v2.0 EXTERNOGLEXT(PFNGLUNIFORM2FPROC, glUniform2f) // Core in v2.0 +EXTERNOGLEXT(PFNGLUNIFORM4FPROC, glUniform4f) // Core in v2.0 EXTERNOGLEXT(PFNGLDRAWBUFFERSPROC, glDrawBuffers) // Core in v2.0 // Generic vertex attributes