diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-05-22 10:42:18 -0700 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-05-22 10:42:18 -0700 |
| commit | b273edd1253e088ea864d399342a0cba2fd0aaa9 (patch) | |
| tree | 317ff7c05eacccb80b3fe06d65d8f64d7ff6019d /indra/newview/app_settings/shaders/class1/interface/uiF.glsl | |
| parent | da72081582c3fd376e228cf0fceaef2ecb1948a9 (diff) | |
| parent | c6fc951f34c665d0f1cd6dcff1bea114fb0ff1a0 (diff) | |
Merge branch 'DRTVWR-559' into DRTVWR-583
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/uiF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/uiF.glsl | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/uiF.glsl b/indra/newview/app_settings/shaders/class1/interface/uiF.glsl index 299bfb72aa..a29b848253 100644 --- a/indra/newview/app_settings/shaders/class1/interface/uiF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/uiF.glsl @@ -23,18 +23,14 @@ * $/LicenseInfo$ */ -#ifdef DEFINE_GL_FRAGCOLOR out vec4 frag_color; -#else -#define frag_color gl_FragColor -#endif uniform sampler2D diffuseMap; -VARYING vec2 vary_texcoord0; -VARYING vec4 vertex_color; +in vec2 vary_texcoord0; +in vec4 vertex_color; void main() { - frag_color = vertex_color*texture2D(diffuseMap, vary_texcoord0.xy); + frag_color = vertex_color*texture(diffuseMap, vary_texcoord0.xy); } |