Browse Source

Minor cleanup.

pull/38/head
Vladimír Vondruš 13 years ago
parent
commit
bfe6033348
  1. 8
      src/Shader.cpp
  2. 2
      src/Test/ContextGLTest.cpp

8
src/Shader.cpp

@ -437,8 +437,8 @@ Int Shader::maxUniformBlocks(const Type type) {
GL_MAX_VERTEX_UNIFORM_BLOCKS,
GL_MAX_FRAGMENT_UNIFORM_BLOCKS,
#ifndef MAGNUM_TARGET_GLES
/** @todo Fix this when glLoadGen has GL_MAX_GEOMETRY_UNIFORM_BLOCKS enum */
0x8A2C /*GL_MAX_GEOMETRY_UNIFORM_BLOCKS*/,
/** @todo Fix this when glLoadGen has `GL_MAX_GEOMETRY_UNIFORM_BLOCKS` enum */
0x8A2C, //GL_MAX_GEOMETRY_UNIFORM_BLOCKS,
GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS,
GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS,
GL_MAX_COMPUTE_UNIFORM_BLOCKS
@ -520,8 +520,8 @@ Int Shader::maxCombinedUniformComponents(const Type type) {
GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS,
GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS,
#ifndef MAGNUM_TARGET_GLES
/** @todo Fix this when glLoadGen has GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS enum */
0x8A32 /*GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS*/,
/** @todo Fix this when glLoadGen has `GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS` enum */
0x8A32, //GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS,
GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS,
GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS,
GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS

2
src/Test/ContextGLTest.cpp

@ -22,9 +22,9 @@
DEALINGS IN THE SOFTWARE.
*/
#include "Test/AbstractOpenGLTester.h"
#include "Context.h"
#include "Extensions.h"
#include "Test/AbstractOpenGLTester.h"
namespace Magnum { namespace Test {

Loading…
Cancel
Save