]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
get rid of a warning in the shader
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 2 May 2010 12:34:01 +0000 (12:34 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 2 May 2010 14:17:30 +0000 (16:17 +0200)
From: Wolfgang (Blub) Bumiller <blub@speed.at>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10118 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a6064c322ead85b1c7970781a2d045223583781b

gl_rmain.c

index f107146ed4da639511d0119b63d6674d4f591fb2..d1bcc8dade28b0eb5dbd79d92bfdd029e61e94f7 100644 (file)
@@ -731,7 +731,7 @@ static const char *builtinshaderstring =
 "      gl_FragColor += texture2D(Texture_First, TexCoord1 + PixelSize*UserVec1.x*vec2( 0.707107,  0.707107)) * UserVec1.y;\n"
 "      gl_FragColor += texture2D(Texture_First, TexCoord1 + PixelSize*UserVec1.x*vec2(-0.453990,  0.891007)) * UserVec1.y;\n"
 "      gl_FragColor /= (1.0 + 5.0 * UserVec1.y);\n"
-"      gl_FragColor.rgb = gl_FragColor.rgb * UserVec2.x + vec3(max(0, sobel - UserVec2.z))*UserVec2.y;\n"
+"      gl_FragColor.rgb = gl_FragColor.rgb * UserVec2.x + vec3(max(0.0, sobel - UserVec2.z))*UserVec2.y;\n"
 "#endif\n"
 "\n"
 "#ifdef USESATURATION\n"