Kaydet (Commit) 8d61b3fe authored tarafından Markus Mohrhard's avatar Markus Mohrhard

texture*D in GLSL is deprecated and not available in core contexts

Change-Id: Ia5da0899d73aea22fe7bae735e57e30dcd37b254
üst 249c5e0f
...@@ -10,10 +10,11 @@ ...@@ -10,10 +10,11 @@
#version 150 core #version 150 core
in vec4 fragmentColor; in vec4 fragmentColor;
out vec4 actualColor;
void main() void main()
{ {
gl_FragColor = fragmentColor; actualColor = fragmentColor;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -12,10 +12,12 @@ ...@@ -12,10 +12,12 @@
in vec2 vTexCoord; in vec2 vTexCoord;
uniform sampler2D TextTex; uniform sampler2D TextTex;
uniform vec4 textColor; uniform vec4 textColor;
out vec4 actualColor;
void main() void main()
{ {
vec3 color = texture2D(TextTex, vTexCoord).rgb; vec3 color = texture(TextTex, vTexCoord).rgb;
gl_FragColor = vec4(textColor.rgb, 1.0 - color.r); actualColor = vec4(textColor.rgb, 1.0 - color.r);
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -11,10 +11,13 @@ ...@@ -11,10 +11,13 @@
uniform sampler2D TextTex; uniform sampler2D TextTex;
in vec2 vTexCoord; in vec2 vTexCoord;
out vec4 actualColor;
void main() void main()
{ {
vec3 color = texture2D(TextTex, vTexCoord).rgb; vec3 color = texture(TextTex, vTexCoord).rgb;
gl_FragColor = vec4(color, 1.0 - color.r); actualColor = vec4(color, 1.0 - color.r);
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -17,7 +17,7 @@ in vec3 vTexCoord; ...@@ -17,7 +17,7 @@ in vec3 vTexCoord;
out vec4 actualColor; out vec4 actualColor;
void main() void main()
{ {
vec3 color = texture2DArray(texArray, vTexCoord.xyz).rgb; vec3 color = texture(texArray, vTexCoord.xyz).rgb;
actualColor = vec4(color, 1.0 - color.r); actualColor = vec4(color, 1.0 - color.r);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment