ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixes

pull/576/head
Vladislav Oleshko 4 years ago
parent
1e363fdab8
commit
ebbed673b2
9 changed files with 9 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/Magnum/GL/AbstractShaderProgram.h
  2. 4
      src/Magnum/GL/Implementation/ShaderProgramState.h
  3. 4
      src/Magnum/GL/Implementation/ShaderState.h
  4. 2
      src/Magnum/GL/Shader.h
  5. 2
      src/Magnum/Shaders/DistanceFieldVectorGL.cpp
  6. 2
      src/Magnum/Shaders/FlatGL.cpp
  7. 2
      src/Magnum/Shaders/VectorGL.cpp
  8. 2
      src/Magnum/Shaders/VertexColorGL.cpp
  9. 2
      src/MagnumExternal/OpenGL/GL/flextGL.h

2
src/Magnum/GL/AbstractShaderProgram.h
Unescape View File

@ -1699,7 +1699,7 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject {
static MAGNUM_GL_LOCAL void cleanLogImplementationAngle(std::string& message); static MAGNUM_GL_LOCAL void cleanLogImplementationAngle(std::string& message);
#endif #endif
static MAGNUM_GL_LOCAL void completionStatusImplementationFallback(GLuint, GLenum, GLint*); static MAGNUM_GL_LOCAL APIENTRY void completionStatusImplementationFallback(GLuint, GLenum, GLint*);
MAGNUM_GL_LOCAL static void use(GLuint id); MAGNUM_GL_LOCAL static void use(GLuint id);
void use(); void use();

4
src/Magnum/GL/Implementation/ShaderProgramState.h
Unescape View File

@ -47,7 +47,9 @@ struct ShaderProgramState {
void(AbstractShaderProgram::*transformFeedbackVaryingsImplementation)(Containers::ArrayView<const std::string>, AbstractShaderProgram::TransformFeedbackBufferMode); void(AbstractShaderProgram::*transformFeedbackVaryingsImplementation)(Containers::ArrayView<const std::string>, AbstractShaderProgram::TransformFeedbackBufferMode);
#endif #endif
void(*cleanLogImplementation)(std::string&); void(*cleanLogImplementation)(std::string&);
void(*completionStatusImplementation)(GLuint, GLenum, GLint* value); /* This is a direct pointer to a GL function, so needs a __stdcall on
Windows to compile properly on 32 bits */
void(APIENTRY *completionStatusImplementation)(GLuint, GLenum, GLint* value);
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL
void(APIENTRY *uniform1fvImplementation)(GLuint, GLint, GLsizei, const GLfloat*); void(APIENTRY *uniform1fvImplementation)(GLuint, GLint, GLsizei, const GLfloat*);

4
src/Magnum/GL/Implementation/ShaderState.h
Unescape View File

@ -53,7 +53,9 @@ struct ShaderState {
void(Shader::*addSourceImplementation)(std::string); void(Shader::*addSourceImplementation)(std::string);
void(*cleanLogImplementation)(std::string&); void(*cleanLogImplementation)(std::string&);
void(*completionStatusImplementation)(GLuint, GLenum, GLint* value); /* This is a direct pointer to a GL function, so needs a __stdcall on
Windows to compile properly on 32 bits */
void(APIENTRY *completionStatusImplementation)(GLuint, GLenum, GLint* value);
GLint maxVertexOutputComponents, GLint maxVertexOutputComponents,
maxFragmentInputComponents; maxFragmentInputComponents;

2
src/Magnum/GL/Shader.h
Unescape View File

@ -680,7 +680,7 @@ class MAGNUM_GL_EXPORT Shader: public AbstractObject {
static MAGNUM_GL_LOCAL void cleanLogImplementationIntelWindows(std::string& message); static MAGNUM_GL_LOCAL void cleanLogImplementationIntelWindows(std::string& message);
#endif #endif
static MAGNUM_GL_LOCAL void completionStatusImplementationFallback(GLuint, GLenum, GLint*); static MAGNUM_GL_LOCAL APIENTRY void completionStatusImplementationFallback(GLuint, GLenum, GLint*);
Type _type; Type _type;
GLuint _id; GLuint _id;

2
src/Magnum/Shaders/DistanceFieldVectorGL.cpp
Unescape View File

@ -166,8 +166,6 @@ template<UnsignedInt dimensions> DistanceFieldVectorGL<dimensions>::DistanceFiel
if (id() == 0) return; if (id() == 0) return;
CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink()); CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink());
CORRADE_INTERNAL_ASSERT_OUTPUT(cs._vert.checkCompile());
CORRADE_INTERNAL_ASSERT_OUTPUT(cs._frag.checkCompile());
const GL::Context& context = GL::Context::current(); const GL::Context& context = GL::Context::current();
const GL::Version version = cs._version; const GL::Version version = cs._version;

2
src/Magnum/Shaders/FlatGL.cpp
Unescape View File

@ -241,8 +241,6 @@ template<UnsignedInt dimensions> FlatGL<dimensions>::FlatGL(CompileState&& cs):
if (id() == 0) return; if (id() == 0) return;
CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink()); CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink());
CORRADE_INTERNAL_ASSERT_OUTPUT(cs._vert.checkCompile());
CORRADE_INTERNAL_ASSERT_OUTPUT(cs._frag.checkCompile());
const GL::Context& context = GL::Context::current(); const GL::Context& context = GL::Context::current();
const GL::Version version = cs._version; const GL::Version version = cs._version;

2
src/Magnum/Shaders/VectorGL.cpp
Unescape View File

@ -168,8 +168,6 @@ template<UnsignedInt dimensions> VectorGL<dimensions>::VectorGL(CompileState&& c
if (id() == 0) return; if (id() == 0) return;
CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink()); CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink());
CORRADE_INTERNAL_ASSERT_OUTPUT(cs._vert.checkCompile());
CORRADE_INTERNAL_ASSERT_OUTPUT(cs._frag.checkCompile());
const GL::Context& context = GL::Context::current(); const GL::Context& context = GL::Context::current();
const GL::Version version = cs._version; const GL::Version version = cs._version;

2
src/Magnum/Shaders/VertexColorGL.cpp
Unescape View File

@ -146,8 +146,6 @@ template<UnsignedInt dimensions> VertexColorGL<dimensions>::VertexColorGL(Compil
if (id() == 0) return; if (id() == 0) return;
CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink()); CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink());
CORRADE_INTERNAL_ASSERT_OUTPUT(cs._vert.checkCompile());
CORRADE_INTERNAL_ASSERT_OUTPUT(cs._frag.checkCompile());
const GL::Context& context = GL::Context::current(); const GL::Context& context = GL::Context::current();
const GL::Version version = cs._version; const GL::Version version = cs._version;

2
src/MagnumExternal/OpenGL/GL/flextGL.h vendored
Unescape View File

@ -1523,7 +1523,7 @@ typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum
/* GL_VERSION_4_5 */ /* GL_VERSION_4_5 */
#define GL_CONTEXT_LOST 0x0507 #define GL_CONTEXT_LOST 0x0507
#define GL_LOWER_LEFT 0x8CA1 #define GL_LOWER_LEFT 0x8CA1
#define GL_UPPER_LEFT 0x8CA2 #define GL_UPPER_LEFT 0x8CA2
#define GL_NEGATIVE_ONE_TO_ONE 0x935E #define GL_NEGATIVE_ONE_TO_ONE 0x935E

Write Preview
Loading…
Cancel
Save