Browse Source

Don't compile desktop-only stuff on ES.

pull/110/head
Vladimír Vondruš 11 years ago
parent
commit
5922c859a2
  1. 4
      src/Magnum/Implementation/driverSpecific.cpp

4
src/Magnum/Implementation/driverSpecific.cpp

@ -34,7 +34,7 @@ namespace Implementation {
/* Used in Shader.cpp (duh) */ /* Used in Shader.cpp (duh) */
bool isShaderCompilationLogEmpty(const std::string&); bool isShaderCompilationLogEmpty(const std::string&);
bool isShaderCompilationLogEmpty(const std::string& result) { bool isShaderCompilationLogEmpty(const std::string& result) {
#ifdef CORRADE_TARGET_WINDOWS #if defined(CORRADE_TARGET_WINDOWS) && !defined(MAGNUM_TARGET_GLES)
/* Intel Windows drivers are too chatty */ /* Intel Windows drivers are too chatty */
if((Context::current()->detectedDriver() & Context::DetectedDriver::IntelWindows) && result == "No errors.\n") if((Context::current()->detectedDriver() & Context::DetectedDriver::IntelWindows) && result == "No errors.\n")
return true; return true;
@ -48,7 +48,7 @@ bool isShaderCompilationLogEmpty(const std::string& result) {
/* Used in AbstractShaderProgram.cpp (duh) */ /* Used in AbstractShaderProgram.cpp (duh) */
bool isProgramLinkLogEmpty(const std::string&); bool isProgramLinkLogEmpty(const std::string&);
bool isProgramLinkLogEmpty(const std::string& result) { bool isProgramLinkLogEmpty(const std::string& result) {
#ifdef CORRADE_TARGET_WINDOWS #if defined(CORRADE_TARGET_WINDOWS) && !defined(MAGNUM_TARGET_GLES)
/* Intel Windows drivers are too chatty */ /* Intel Windows drivers are too chatty */
if((Context::current()->detectedDriver() & Context::DetectedDriver::IntelWindows) && result == "No errors.\n") if((Context::current()->detectedDriver() & Context::DetectedDriver::IntelWindows) && result == "No errors.\n")
return true; return true;

Loading…
Cancel
Save