Commit 0787848d authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed some encoding



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@19076 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 6b12c478
......@@ -1351,12 +1351,12 @@ 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;
case GL_TEXTURE_CUBE_MAP: type = "samplerCube"; break;
#ifdef GL_ARB_texture_rectangle //ARCH_DARWIN doesn't support all texture defines with all xcode version (xcode 5.0 seems to support all)
case GL_TEXTURE_RECTANGLE_ARB: type = "sampler2DRect"; break;
#endif
#ifdef GL_ARB_texture_buffer_object
case GL_TEXTURE_BUFFER_ARB: type = "samplerBuffer"; break;
case GL_TEXTURE_BUFFER_ARB: type = "samplerBuffer"; break;
#endif
#ifdef GL_EXT_texture_array
case GL_TEXTURE_1D_ARRAY_EXT: type = "sampler1DArray"; break;
......@@ -1367,7 +1367,7 @@ void ShaderProgGenerator::buildFragmentShader()
#endif
#ifdef GL_ARB_texture_multisample
case GL_TEXTURE_2D_MULTISAMPLE: type = "sampler2DMS"; break;
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: type = "sampler2DMSArray"; break;
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: type = "sampler2DMSArray"; break;
#endif
default: std::cerr << "Texture Type not supported "<< iter->second.type << std::endl; break;
}
......@@ -2010,12 +2010,12 @@ 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;
case GL_TEXTURE_CUBE_MAP: resStrm << "GL_TEXTURE_CUBE_MAP"; break;
#ifdef GL_ARB_texture_rectangle //ARCH_DARWIN doesn't support all texture defines with all xcode version (xcode 5.0 seems to support all)
case GL_TEXTURE_RECTANGLE_ARB: resStrm << "GL_TEXTURE_RECTANGLE"; break;
#endif
#ifdef GL_ARB_texture_buffer_object
case GL_TEXTURE_BUFFER_ARB: resStrm << "GL_TEXTURE_BUFFER"; break;
case GL_TEXTURE_BUFFER_ARB: resStrm << "GL_TEXTURE_BUFFER"; break;
#endif
#ifdef GL_EXT_texture_array
case GL_TEXTURE_1D_ARRAY_EXT: resStrm << "GL_TEXTURE_1D_ARRAY"; break;
......@@ -2026,7 +2026,7 @@ QString ShaderGenDesc::toString() const
#endif
#ifdef GL_ARB_texture_multisample
case GL_TEXTURE_2D_MULTISAMPLE: resStrm << "GL_TEXTURE_2D_MULTISAMPLE"; break;
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: resStrm << "GL_TEXTURE_2D_MULTISAMPLE_ARRAY"; break;
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: resStrm << "GL_TEXTURE_2D_MULTISAMPLE_ARRAY"; break;
#endif
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