From 233d079b454c03d4fb2613e87daddf084a679d23 Mon Sep 17 00:00:00 2001 From: rogerman Date: Fri, 21 Dec 2012 04:01:37 +0000 Subject: [PATCH] Cocoa Port: - Fix compiling. (I forgot to commit displayView.h in r4432, oops!) --- desmume/src/cocoa/userinterface/displayView.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/desmume/src/cocoa/userinterface/displayView.h b/desmume/src/cocoa/userinterface/displayView.h index b5612264f..6eff371ed 100644 --- a/desmume/src/cocoa/userinterface/displayView.h +++ b/desmume/src/cocoa/userinterface/displayView.h @@ -122,6 +122,9 @@ CGLContextObj cglDisplayContext; NSOpenGLContext *oglRendererContext; + BOOL isVBOSupported; + BOOL isShadersSupported; + DisplayViewDelegate *dispViewDelegate; GLint glTexRenderStyle; GLenum glTexPixelFormat; @@ -130,10 +133,21 @@ GLuint mainDisplayTexIndex; GLuint touchDisplayTexIndex; - GLuint renderDisplayListIndex; GLuint vboTexCoordID; GLuint vboVertexID; GLuint vboElementID; + + GLuint vertexShaderID; + GLuint fragmentShaderID; + GLuint shaderProgram; + + GLint uniformAngleDegrees; + GLint uniformScalar; + GLint uniformViewSize; + + GLint *vtxBuffer; + GLfloat *texCoordBuffer; + GLubyte *vtxIndexBuffer; } - (void) drawVideoFrame; @@ -148,6 +162,7 @@ extern "C" { #endif +static GLint SetupShaders(GLuint *vShaderID, GLuint *fShaderID, GLuint *programID); bool OSXOpenGLRendererInit(); bool OSXOpenGLRendererBegin(); void OSXOpenGLRendererEnd();