0.4 Win-Beta0.4.0

1 files changed, 12 insertions, 5 deletions

diff --git a/LibOVR/Src/CAPI/GL/CAPI_GL_DistortionRenderer.h b/LibOVR/Src/CAPI/GL/CAPI_GL_DistortionRenderer.h
index 60f1a9f..24dbbd6 100644
--- a/LibOVR/Src/CAPI/GL/CAPI_GL_DistortionRenderer.h
+++ b/LibOVR/Src/CAPI/GL/CAPI_GL_DistortionRenderer.h
@@ -47,9 +47,9 @@ public:
     virtual bool Initialize(const ovrRenderAPIConfig* apiConfig,
                             unsigned distortionCaps);
 
-    virtual void SubmitEye(int eyeId, ovrTexture* eyeTexture);
+    virtual void SubmitEye(int eyeId, const ovrTexture* eyeTexture);
 
-    virtual void EndFrame(bool swapBuffers, unsigned char* latencyTesterDrawColor, unsigned char* latencyTester2DrawColor);
+    virtual void EndFrame(bool swapBuffers);
 
     void         WaitUntilGpuIdle();
 
@@ -68,21 +68,25 @@ protected:
         virtual void Restore();
         
     protected:
-        void ApplyBool(GLenum Name, GLint Value);
+        void ApplyBool(GLenum Name, GLint Value, GLint index = -1);
         
     public:
         GLint GlMajorVersion;
         GLint GlMinorVersion;
         bool SupportsVao;
+        bool SupportsDrawBuffers;
         
         GLint Viewport[4];
         GLfloat ClearColor[4];
         GLint DepthTest;
         GLint CullFace;
+        GLint SRGB;
         GLint Program;
         GLint ActiveTexture;
         GLint TextureBinding;
-        GLint VertexArray;
+        GLint VertexArrayBinding;
+        GLint ElementArrayBufferBinding;
+        GLint ArrayBufferBinding;
         GLint FrameBufferBinding;
         
         GLint Blend;
@@ -140,6 +144,8 @@ protected:
     void renderLatencyQuad(unsigned char* latencyTesterDrawColor);
     void renderLatencyPixel(unsigned char* latencyTesterPixelColor);
 	
+    void renderEndFrame();
+
     Ptr<Texture>        pEyeTextures[2];
 
 	Ptr<Buffer>         DistortionMeshVBs[2];    // one per-eye
@@ -157,6 +163,7 @@ protected:
 	GLuint              LatencyVAO;
     Ptr<Buffer>         LatencyTesterQuadVB;
     Ptr<ShaderSet>      SimpleQuadShader;
+    Ptr<ShaderSet>      SimpleQuadGammaShader;
 
     Ptr<Texture>             CurRenderTarget;
     Array<Ptr<Texture> >     DepthBuffers;
@@ -175,4 +182,4 @@ protected:
 
 }}} // OVR::CAPI::GL
 
-#endif // OVR_CAPI_GL_DistortionRenderer_h
\ No newline at end of file
+#endif // OVR_CAPI_GL_DistortionRenderer_h