[Bf-blender-cvs] [fe3110a2859] master: Fix FallbackCyclesBlitShader compilation error

Germano Cavalcante noreply at git.blender.org
Wed Dec 14 15:59:49 CET 2022


Commit: fe3110a2859d84401dceda06fd41f3b082eae790
Author: Germano Cavalcante
Date:   Wed Dec 14 11:59:11 2022 -0300
Branches: master
https://developer.blender.org/rBfe3110a2859d84401dceda06fd41f3b082eae790

Fix FallbackCyclesBlitShader compilation error

Error: C0204: version directive must be first statement and may not be
repeated

===================================================================

M	intern/cycles/blender/display_driver.cpp

===================================================================

diff --git a/intern/cycles/blender/display_driver.cpp b/intern/cycles/blender/display_driver.cpp
index 3c347145117..60dd5e2c1d2 100644
--- a/intern/cycles/blender/display_driver.cpp
+++ b/intern/cycles/blender/display_driver.cpp
@@ -57,7 +57,6 @@ int BlenderDisplayShader::get_tex_coord_attrib_location()
 
 /* TODO move shaders to standalone .glsl file. */
 static const char *FALLBACK_VERTEX_SHADER =
-    "#version 330\n"
     "uniform vec2 fullscreen;\n"
     "in vec2 texCoord;\n"
     "in vec2 pos;\n"
@@ -75,7 +74,6 @@ static const char *FALLBACK_VERTEX_SHADER =
     "}\n\0";
 
 static const char *FALLBACK_FRAGMENT_SHADER =
-    "#version 330\n"
     "uniform sampler2D image_texture;\n"
     "in vec2 texCoord_interp;\n"
     "out vec4 fragColor;\n"



More information about the Bf-blender-cvs mailing list