瀏覽代碼

Merge pull request #33920 from vnen/uwp-gles2-msaa

Use ANGLE multisample extensions for UWP
Rémi Verschelde 5 年之前
父節點
當前提交
a88afd22ca
共有 1 個文件被更改,包括 8 次插入1 次删除
  1. 8 1
      drivers/gles2/rasterizer_storage_gles2.cpp

+ 8 - 1
drivers/gles2/rasterizer_storage_gles2.cpp

@@ -85,7 +85,9 @@ GLuint RasterizerStorageGLES2::system_fbo = 0;
 #define glClearDepth glClearDepthf
 #define glClearDepth glClearDepthf
 
 
 // enable extensions manually for android and ios
 // enable extensions manually for android and ios
+#ifndef UWP_ENABLED
 #include <dlfcn.h> // needed to load extensions
 #include <dlfcn.h> // needed to load extensions
+#endif
 
 
 #ifdef IPHONE_ENABLED
 #ifdef IPHONE_ENABLED
 
 
@@ -93,13 +95,18 @@ GLuint RasterizerStorageGLES2::system_fbo = 0;
 //void *glRenderbufferStorageMultisampleAPPLE;
 //void *glRenderbufferStorageMultisampleAPPLE;
 //void *glResolveMultisampleFramebufferAPPLE;
 //void *glResolveMultisampleFramebufferAPPLE;
 #define glRenderbufferStorageMultisample glRenderbufferStorageMultisampleAPPLE
 #define glRenderbufferStorageMultisample glRenderbufferStorageMultisampleAPPLE
-#elif ANDROID_ENABLED
+#elif defined(ANDROID_ENABLED)
 
 
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2ext.h>
 PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC glRenderbufferStorageMultisampleEXT;
 PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC glRenderbufferStorageMultisampleEXT;
 PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC glFramebufferTexture2DMultisampleEXT;
 PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC glFramebufferTexture2DMultisampleEXT;
 #define glRenderbufferStorageMultisample glRenderbufferStorageMultisampleEXT
 #define glRenderbufferStorageMultisample glRenderbufferStorageMultisampleEXT
 #define glFramebufferTexture2DMultisample glFramebufferTexture2DMultisampleEXT
 #define glFramebufferTexture2DMultisample glFramebufferTexture2DMultisampleEXT
+
+#elif defined(UWP_ENABLED)
+#include <GLES2/gl2ext.h>
+#define glRenderbufferStorageMultisample glRenderbufferStorageMultisampleANGLE
+#define glFramebufferTexture2DMultisample glFramebufferTexture2DMultisampleANGLE
 #endif
 #endif
 
 
 #define GL_MAX_SAMPLES 0x8D57
 #define GL_MAX_SAMPLES 0x8D57