Commit 220689f6 authored by Matthias Möller's avatar Matthias Möller

fix unsopported texture types for macos

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16815 383ad7c9-94d9-4d36-a494-682f7c89f535
parent bf436c14
......@@ -880,14 +880,16 @@ void ShaderProgGenerator::buildFragmentShader()
case GL_TEXTURE_1D: type = "sampler1D"; break;
case GL_TEXTURE_2D: type = "sampler2D"; break;
case GL_TEXTURE_3D: type = "sampler3D"; break;
case GL_TEXTURE_CUBE_MAP: type = "samplerCube​"; break;
#if defined(ARCH_DARWIN)
case GL_TEXTURE_RECTANGLE: type = "sampler2DRect"; break;
case GL_TEXTURE_BUFFER: type = "samplerBuffer​"; break;
case GL_TEXTURE_CUBE_MAP: type = "samplerCube​"; break;
case GL_TEXTURE_1D_ARRAY: type = "sampler1DArray"; break;
case GL_TEXTURE_2D_ARRAY: type = "sampler2DArray"; break;
case GL_TEXTURE_CUBE_MAP_ARRAY: type = "samplerCubeArray"; break;
case GL_TEXTURE_2D_MULTISAMPLE: type = "sampler2DMS"; break;
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: type = "sampler2DMSArray​"; break;
#endif //defined(ARCH_DARWIN)
default: std::cerr << "Texture Type not supported "<< iter->second.type << std::endl; break;
}
......@@ -1229,14 +1231,16 @@ QString ShaderGenDesc::toString() const
case GL_TEXTURE_1D: resStrm << "GL_TEXTURE_1D"; break;
case GL_TEXTURE_2D: resStrm << "GL_TEXTURE_2D"; break;
case GL_TEXTURE_3D: resStrm << "GL_TEXTURE_3D"; break;
case GL_TEXTURE_CUBE_MAP: resStrm << "GL_TEXTURE_CUBE_MAP​"; break;
#if defined(ARCH_DARWIN)
case GL_TEXTURE_RECTANGLE: resStrm << "GL_TEXTURE_RECTANGLE"; break;
case GL_TEXTURE_BUFFER: resStrm << "GL_TEXTURE_BUFFER​"; break;
case GL_TEXTURE_CUBE_MAP: resStrm << "GL_TEXTURE_CUBE_MAP​"; break;
case GL_TEXTURE_1D_ARRAY: resStrm << "GL_TEXTURE_1D_ARRAY"; break;
case GL_TEXTURE_2D_ARRAY: resStrm << "GL_TEXTURE_2D_ARRAY"; break;
case GL_TEXTURE_CUBE_MAP_ARRAY: resStrm << "GL_TEXTURE_CUBE_MAP_ARRAY"; break;
case GL_TEXTURE_2D_MULTISAMPLE: resStrm << "GL_TEXTURE_2D_MULTISAMPLE"; break;
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: resStrm << "GL_TEXTURE_2D_MULTISAMPLE_ARRAY​"; break;
#endif //defined(ARCH_DARWIN)
default: std::cerr << "Texture Type with number "<< iter->second.type << " on stage "<< iter->first << " is not supported " << std::endl; break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment