2
0
Ivan Safrin 10 жил өмнө
parent
commit
ed04356c04

+ 2 - 2
build/windows/universal/PolycodeCore/PolycodeCore.vcxproj

@@ -348,7 +348,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NO_OGG;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -364,7 +364,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NO_OGG;_CRT_SECURE_NO_WARNINGS;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

+ 3 - 3
include/angle/EGL/egl.h

@@ -36,7 +36,7 @@ extern "C" {
 ** Khronos $Revision: 29318 $ on $Date: 2015-01-02 03:16:10 -0800 (Fri, 02 Jan 2015) $
 */
 
-#include <EGL/eglplatform.h>
+#include <angle/EGL/eglplatform.h>
 
 /* Generated on date 20150102 */
 
@@ -53,8 +53,8 @@ extern "C" {
 #define EGL_VERSION_1_0 1
 typedef unsigned int EGLBoolean;
 typedef void *EGLDisplay;
-#include <KHR/khrplatform.h>
-#include <EGL/eglplatform.h>
+#include <angle/KHR/khrplatform.h>
+#include <angle/EGL/eglplatform.h>
 typedef void *EGLConfig;
 typedef void *EGLSurface;
 typedef void *EGLContext;

+ 1 - 1
include/angle/EGL/eglext.h

@@ -36,7 +36,7 @@ extern "C" {
 ** Khronos $Revision: 27018 $ on $Date: 2014-06-10 08:06:12 -0700 (Tue, 10 Jun 2014) $
 */
 
-#include <EGL/eglplatform.h>
+#include <angle/EGL/eglplatform.h>
 
 #define EGL_EGLEXT_VERSION 20140610
 

+ 1 - 1
include/angle/EGL/eglplatform.h

@@ -34,7 +34,7 @@
  * by filing a bug against product "EGL" component "Registry".
  */
 
-#include <KHR/khrplatform.h>
+#include <angle/KHR/khrplatform.h>
 
 /* Macros used in EGL function prototype declarations.
  *

+ 1 - 1
include/angle/GLES2/gl2.h

@@ -3,7 +3,7 @@
 
 /* $Revision: 20555 $ on $Date:: 2013-02-12 14:32:47 -0800 #$ */
 
-#include <GLES2/gl2platform.h>
+#include <angle/GLES2/gl2platform.h>
 
 #ifdef __cplusplus
 extern "C" {

+ 1 - 1
include/angle/GLES2/gl2platform.h

@@ -17,7 +17,7 @@
  * by filing a bug against product "OpenGL-ES" component "Registry".
  */
 
-#include <KHR/khrplatform.h>
+#include <angle/KHR/khrplatform.h>
 
 #ifndef GL_APICALL
 #define GL_APICALL  KHRONOS_APICALL

+ 7 - 10
include/polycode/core/PolyOpenGLGraphicsInterface.h

@@ -34,20 +34,17 @@ THE SOFTWARE.
 	#include <OpenGL/glu.h>
 
 #elif PLATFORM == PLATFORM_WINDOWS
-/*
 	#if defined(WINAPI_FAMILY)
-		#include <GLES2/gl2.h>
-		#include <GLES2/gl2ext.h>
-		#include <EGL/egl.h>
-		#include <EGL/eglext.h>
-		#include <EGL/eglplatform.h>
-		#include <angle_windowsstore.h>
+		#define STRICT_OPENGLES2
+		#include <angle/GLES2/gl2.h>
+		#include <angle/GLES2/gl2ext.h>
+		#include <angle/EGL/egl.h>
+		#include <angle/EGL/eglext.h>
+		#include <angle/EGL/eglplatform.h>
+		#include <angle/angle_windowsstore.h>
 	#else
-	*/
 		#include <glew/GL/glew.h>
-/*
 	#endif
-	*/
 #else	
 	#if defined(USE_EGL)
 		#include <EGL/egl.h>

+ 6 - 6
include/polycode/core/PolyUWPCore.h

@@ -33,12 +33,12 @@ THE SOFTWARE.
 #include <wrl\client.h>
 #include <wrl.h>
 
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <EGL/eglplatform.h>
-#include <angle_windowsstore.h>
+#include <angle/GLES2/gl2.h>
+#include <angle/GLES2/gl2ext.h>
+#include <angle/EGL/egl.h>
+#include <angle/EGL/eglext.h>
+#include <angle/EGL/eglplatform.h>
+#include <angle/angle_windowsstore.h>
 
 #include "polycode/core/PolyXAudio2AudioInterface.h"
 

+ 1 - 1
src/core/PolyOpenGLGraphicsInterface.cpp

@@ -360,7 +360,7 @@ void OpenGLGraphicsInterface::createRenderBuffer(RenderBuffer *renderBuffer) {
         renderBuffer->depthTexture->filteringMode = Texture::FILTERING_LINEAR;
         createTexture(renderBuffer->depthTexture);
         
-        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, renderBuffer->getWidth(), renderBuffer->getHeight());
+        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, renderBuffer->getWidth(), renderBuffer->getHeight());
         glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, *((GLuint*)renderBuffer->depthTexture->platformData), 0);
     }