Browse Source

Use more descriptive resource group name.

pull/51/head
Vladimír Vondruš 13 years ago
parent
commit
47b16d11b1
  1. 8
      src/Test/AbstractShaderProgramGLTest.cpp
  2. 2
      src/Test/AbstractShaderProgramGLTestFiles/resources.conf

8
src/Test/AbstractShaderProgramGLTest.cpp

@ -152,7 +152,7 @@ namespace {
} }
void AbstractShaderProgramGLTest::create() { void AbstractShaderProgramGLTest::create() {
Utility::Resource rs("MyShader"); Utility::Resource rs("AbstractShaderProgramGLTest");
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
Shader vert(Version::GL210, Shader::Type::Vertex); Shader vert(Version::GL210, Shader::Type::Vertex);
@ -206,7 +206,7 @@ void AbstractShaderProgramGLTest::create() {
void AbstractShaderProgramGLTest::createMultipleOutputs() { void AbstractShaderProgramGLTest::createMultipleOutputs() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
Utility::Resource rs("MyShader"); Utility::Resource rs("AbstractShaderProgramGLTest");
Shader vert(Version::GL210, Shader::Type::Vertex); Shader vert(Version::GL210, Shader::Type::Vertex);
vert.addSource(rs.get("MyShader.vert")); vert.addSource(rs.get("MyShader.vert"));
@ -248,7 +248,7 @@ void AbstractShaderProgramGLTest::createMultipleOutputs() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
void AbstractShaderProgramGLTest::createMultipleOutputsIndexed() { void AbstractShaderProgramGLTest::createMultipleOutputsIndexed() {
Utility::Resource rs("MyShader"); Utility::Resource rs("AbstractShaderProgramGLTest");
Shader vert(Version::GL210, Shader::Type::Vertex); Shader vert(Version::GL210, Shader::Type::Vertex);
vert.addSource(rs.get("MyShader.vert")); vert.addSource(rs.get("MyShader.vert"));
@ -298,7 +298,7 @@ namespace {
} }
MyShader::MyShader() { MyShader::MyShader() {
Utility::Resource rs("MyShader"); Utility::Resource rs("AbstractShaderProgramGLTest");
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
Shader vert(Version::GL210, Shader::Type::Vertex); Shader vert(Version::GL210, Shader::Type::Vertex);

2
src/Test/AbstractShaderProgramGLTestFiles/resources.conf

@ -1,4 +1,4 @@
group=MyShader group=AbstractShaderProgramGLTest
[file] [file]
filename=MyShader.frag filename=MyShader.frag

Loading…
Cancel
Save