فهرست منبع

Fixed fp16 texture on mac

Ivan Safrin 9 سال پیش
والد
کامیت
11d7b67f07
2فایلهای تغییر یافته به همراه5 افزوده شده و 3 حذف شده
  1. 2 2
      build/osx/TemplateApp/TemplateApp/PolycodeTemplateApp.mm
  2. 3 1
      src/core/PolyOpenGLGraphicsInterface.cpp

+ 2 - 2
build/osx/TemplateApp/TemplateApp/PolycodeTemplateApp.mm

@@ -40,7 +40,7 @@ PolycodeTemplateApp::PolycodeTemplateApp(PolycodeView *view) {
     fpsLabel = new SceneLabel("FPS:", 32, "main", Label::ANTIALIAS_FULL, 0.1);
     fpsLabel = new SceneLabel("FPS:", 32, "main", Label::ANTIALIAS_FULL, 0.1);
     scene->addChild(fpsLabel);
     scene->addChild(fpsLabel);
     fpsLabel->setPositionX(-0.6);
     fpsLabel->setPositionX(-0.6);
-    /*
+
     scene->getDefaultCamera()->setPostFilterByName("HDRProcessBloom");
     scene->getDefaultCamera()->setPostFilterByName("HDRProcessBloom");
 
 
     camera->getShaderPass(0).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "brightThreshold")->setNumber(0.1);
     camera->getShaderPass(0).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "brightThreshold")->setNumber(0.1);
@@ -48,7 +48,7 @@ PolycodeTemplateApp::PolycodeTemplateApp(PolycodeView *view) {
     camera->getShaderPass(2).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "blurSize")->setNumber(0.01);
     camera->getShaderPass(2).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "blurSize")->setNumber(0.01);
     camera->getShaderPass(3).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "bloomFactor")->setNumber(2.0);
     camera->getShaderPass(3).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "bloomFactor")->setNumber(2.0);
     camera->getShaderPass(3).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "exposure")->setNumber(0.7);
     camera->getShaderPass(3).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "exposure")->setNumber(0.7);
- */
+
 
 
     //scene->getDefaultCamera()->setPostFilterByName("Blur");
     //scene->getDefaultCamera()->setPostFilterByName("Blur");
     //camera->getShaderPass(0).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "blurSize")->setNumber(0.003);
     //camera->getShaderPass(0).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "blurSize")->setNumber(0.003);

+ 3 - 1
src/core/PolyOpenGLGraphicsInterface.cpp

@@ -436,8 +436,10 @@ void OpenGLGraphicsInterface::createTexture(Texture *texture) {
             break;
             break;
         case Image::IMAGE_FP16:
         case Image::IMAGE_FP16:
             glTextureType = GL_RGBA;
             glTextureType = GL_RGBA;
-#ifdef GL_RGBA16F_EXT
+#if defined(GL_RGBA16F_EXT)
             glTextureFormat = GL_RGBA16F_EXT;
             glTextureFormat = GL_RGBA16F_EXT;
+#elif defined(GL_RGBA16F_ARB)
+            glTextureFormat = GL_RGBA16F_ARB;
 #else
 #else
             glTextureFormat = GL_RGBA16;
             glTextureFormat = GL_RGBA16;
 #endif
 #endif