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

Fix wrong assumptions about Mac GL builds being always desktop GL.

pull/525/head
Vladimír Vondruš 4 years ago
parent
c36ed5e61d
commit
0964ddbf0c
9 changed files with 23 additions and 23 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. 4
      src/Magnum/GL/Implementation/driverSpecific.cpp
  2. 6
      src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp
  3. 8
      src/Magnum/GL/Test/BufferTextureGLTest.cpp
  4. 4
      src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
  5. 4
      src/Magnum/Shaders/Test/FlatGLTest.cpp
  6. 8
      src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
  7. 4
      src/Magnum/Shaders/Test/PhongGLTest.cpp
  8. 4
      src/Magnum/Shaders/Test/VectorGLTest.cpp
  9. 4
      src/Magnum/Shaders/Test/VertexColorGLTest.cpp

4
src/Magnum/GL/Implementation/driverSpecific.cpp
Unescape View File

@ -430,7 +430,7 @@ auto Context::detectedDriver() -> DetectedDrivers {
_detectedDrivers = DetectedDrivers{}; _detectedDrivers = DetectedDrivers{};
#ifndef CORRADE_TARGET_APPLE #if !defined(CORRADE_TARGET_APPLE) || defined(MAGNUM_TARGET_GLES)
const Containers::StringView renderer = const Containers::StringView renderer =
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL
rendererString() rendererString()
@ -439,7 +439,7 @@ auto Context::detectedDriver() -> DetectedDrivers {
#endif #endif
; ;
#endif #endif
#if !defined(CORRADE_TARGET_APPLE) || defined(MAGNUM_TARGET_GLES) #ifndef CORRADE_TARGET_APPLE
const Containers::StringView vendor = const Containers::StringView vendor =
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL
vendorString() vendorString()

6
src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp
Unescape View File

@ -248,7 +248,7 @@ void AbstractShaderProgramGLTest::create() {
MAGNUM_VERIFY_NO_GL_ERROR(); MAGNUM_VERIFY_NO_GL_ERROR();
CORRADE_VERIFY(linked); CORRADE_VERIFY(linked);
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(valid); CORRADE_VERIFY(valid);
@ -429,7 +429,7 @@ void AbstractShaderProgramGLTest::uniformNotFound() {
, Shader::Type::Fragment); , Shader::Type::Fragment);
vert.addSource("void main() { gl_Position = vec4(0.0); }"); vert.addSource("void main() { gl_Position = vec4(0.0); }");
frag.addSource( frag.addSource(
#ifndef CORRADE_TARGET_APPLE #if !defined(CORRADE_TARGET_APPLE) || defined(MAGNUM_TARGET_GLES)
"void main() { gl_FragColor = vec4(1.0); }" "void main() { gl_FragColor = vec4(1.0); }"
#else #else
"out vec4 color;\n" "out vec4 color;\n"
@ -694,7 +694,7 @@ void AbstractShaderProgramGLTest::createUniformBlocks() {
MAGNUM_VERIFY_NO_GL_ERROR(); MAGNUM_VERIFY_NO_GL_ERROR();
CORRADE_VERIFY(linked); CORRADE_VERIFY(linked);
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(valid); CORRADE_VERIFY(valid);

8
src/Magnum/GL/Test/BufferTextureGLTest.cpp
Unescape View File

@ -34,7 +34,7 @@
#include "Magnum/GL/ImageFormat.h" #include "Magnum/GL/ImageFormat.h"
#include "Magnum/GL/OpenGLTester.h" #include "Magnum/GL/OpenGLTester.h"
#if defined(CORRADE_TARGET_APPLE) && !defined(CORRADE_TARGET_IOS) #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
#include "Magnum/GL/Texture.h" #include "Magnum/GL/Texture.h"
#include "Magnum/GL/TextureFormat.h" #include "Magnum/GL/TextureFormat.h"
#endif #endif
@ -57,7 +57,7 @@ struct BufferTextureGLTest: OpenGLTester {
void resetBuffer(); void resetBuffer();
#if defined(CORRADE_TARGET_APPLE) && !defined(CORRADE_TARGET_IOS) #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
void appleSetBufferSubData(); void appleSetBufferSubData();
void appleSetUnrelatedBufferData(); void appleSetUnrelatedBufferData();
void appleSetBufferQueryData(); void appleSetBufferQueryData();
@ -81,7 +81,7 @@ BufferTextureGLTest::BufferTextureGLTest() {
&BufferTextureGLTest::resetBuffer, &BufferTextureGLTest::resetBuffer,
#if defined(CORRADE_TARGET_APPLE) && !defined(CORRADE_TARGET_IOS) #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
&BufferTextureGLTest::appleSetBufferSubData, &BufferTextureGLTest::appleSetBufferSubData,
&BufferTextureGLTest::appleSetUnrelatedBufferData, &BufferTextureGLTest::appleSetUnrelatedBufferData,
&BufferTextureGLTest::appleSetBufferQueryData, &BufferTextureGLTest::appleSetBufferQueryData,
@ -348,7 +348,7 @@ void BufferTextureGLTest::resetBuffer() {
MAGNUM_VERIFY_NO_GL_ERROR(); MAGNUM_VERIFY_NO_GL_ERROR();
} }
#if defined(CORRADE_TARGET_APPLE) && !defined(CORRADE_TARGET_IOS) #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
void BufferTextureGLTest::appleSetBufferSubData() { void BufferTextureGLTest::appleSetBufferSubData() {
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_buffer_object>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_buffer_object>())
CORRADE_SKIP(Extensions::ARB::texture_buffer_object::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_buffer_object::string() << "is not supported.");

4
src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
Unescape View File

@ -357,7 +357,7 @@ template<UnsignedInt dimensions> void DistanceFieldVectorGLTest::construct() {
CORRADE_COMPARE(shader.flags(), data.flags); CORRADE_COMPARE(shader.flags(), data.flags);
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
@ -397,7 +397,7 @@ template<UnsignedInt dimensions> void DistanceFieldVectorGLTest::constructUnifor
CORRADE_COMPARE(shader.drawCount(), data.drawCount); CORRADE_COMPARE(shader.drawCount(), data.drawCount);
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);

4
src/Magnum/Shaders/Test/FlatGLTest.cpp
Unescape View File

@ -685,7 +685,7 @@ template<UnsignedInt dimensions> void FlatGLTest::construct() {
CORRADE_COMPARE(shader.flags(), data.flags); CORRADE_COMPARE(shader.flags(), data.flags);
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
@ -729,7 +729,7 @@ template<UnsignedInt dimensions> void FlatGLTest::constructUniformBuffers() {
CORRADE_COMPARE(shader.drawCount(), data.drawCount); CORRADE_COMPARE(shader.drawCount(), data.drawCount);
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);

8
src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
Unescape View File

@ -983,7 +983,7 @@ void MeshVisualizerGLTest::construct2D() {
CORRADE_COMPARE(shader.flags(), data.flags); CORRADE_COMPARE(shader.flags(), data.flags);
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
@ -1061,7 +1061,7 @@ void MeshVisualizerGLTest::constructUniformBuffers2D() {
CORRADE_COMPARE(shader.flags(), data.flags); CORRADE_COMPARE(shader.flags(), data.flags);
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
@ -1121,7 +1121,7 @@ void MeshVisualizerGLTest::construct3D() {
CORRADE_COMPARE(shader.flags(), data.flags); CORRADE_COMPARE(shader.flags(), data.flags);
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
@ -1199,7 +1199,7 @@ void MeshVisualizerGLTest::constructUniformBuffers3D() {
CORRADE_COMPARE(shader.flags(), data.flags); CORRADE_COMPARE(shader.flags(), data.flags);
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);

4
src/Magnum/Shaders/Test/PhongGLTest.cpp
Unescape View File

@ -1012,7 +1012,7 @@ void PhongGLTest::construct() {
CORRADE_COMPARE(shader.lightCount(), data.lightCount); CORRADE_COMPARE(shader.lightCount(), data.lightCount);
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
@ -1055,7 +1055,7 @@ void PhongGLTest::constructUniformBuffers() {
CORRADE_COMPARE(shader.drawCount(), data.drawCount); CORRADE_COMPARE(shader.drawCount(), data.drawCount);
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);

4
src/Magnum/Shaders/Test/VectorGLTest.cpp
Unescape View File

@ -354,7 +354,7 @@ template<UnsignedInt dimensions> void VectorGLTest::construct() {
CORRADE_COMPARE(shader.flags(), data.flags); CORRADE_COMPARE(shader.flags(), data.flags);
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
@ -393,7 +393,7 @@ template<UnsignedInt dimensions> void VectorGLTest::constructUniformBuffers() {
CORRADE_COMPARE(shader.drawCount(), data.drawCount); CORRADE_COMPARE(shader.drawCount(), data.drawCount);
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);

4
src/Magnum/Shaders/Test/VertexColorGLTest.cpp
Unescape View File

@ -293,7 +293,7 @@ template<UnsignedInt dimensions> void VertexColorGLTest::construct() {
VertexColorGL<dimensions> shader; VertexColorGL<dimensions> shader;
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);
@ -332,7 +332,7 @@ template<UnsignedInt dimensions> void VertexColorGLTest::constructUniformBuffers
CORRADE_COMPARE(shader.drawCount(), data.drawCount); CORRADE_COMPARE(shader.drawCount(), data.drawCount);
CORRADE_VERIFY(shader.id()); CORRADE_VERIFY(shader.id());
{ {
#ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
#endif #endif
CORRADE_VERIFY(shader.validate().first); CORRADE_VERIFY(shader.validate().first);

Write Preview
Loading…
Cancel
Save