From a8bb3a988005695cab86bf11736d93d9f4b3072c Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Thu, 24 Mar 2022 09:30:53 -0700
Subject: [PATCH] opengl: replace all texture2Ds with texture

No idea how this passed through the cracks but oh well
---
 app/node/math/math/mathbase.cpp         | 4 ++--
 app/shaders/blur.frag                   | 4 ++--
 app/shaders/colormanage.frag            | 2 +-
 app/shaders/cornerpin.frag              | 4 ++--
 app/shaders/crop.frag                   | 2 +-
 app/shaders/crossdissolve.frag          | 4 ++--
 app/shaders/default.frag                | 2 +-
 app/shaders/deinterlace.frag            | 2 +-
 app/shaders/diptoblack.frag             | 8 ++++----
 app/shaders/flip.frag                   | 4 ++--
 app/shaders/interlace.frag              | 4 ++--
 app/shaders/mosaic.frag                 | 2 +-
 app/shaders/rgbhistogram.frag           | 2 +-
 app/shaders/rgbhistogram_secondary.frag | 2 +-
 app/shaders/rgbwaveform.frag            | 2 +-
 app/shaders/stroke.frag                 | 4 ++--
 16 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/node/math/math/mathbase.cpp b/app/node/math/math/mathbase.cpp
index 3cdbdff4b..1876416c2 100644
--- a/app/node/math/math/mathbase.cpp
+++ b/app/node/math/math/mathbase.cpp
@@ -48,7 +48,7 @@ ShaderCode MathNodeBase::GetShaderCodeInternal(const QString &shader_id, const Q
     const QString& mat_in = (type_a == NodeValue::kTexture) ? param_b_in : param_a_in;
 
     // No-op frag shader (can we return QString() instead?)
-    operation = QStringLiteral("texture2D(%1, ove_texcoord)").arg(tex_in);
+    operation = QStringLiteral("texture(%1, ove_texcoord)").arg(tex_in);
 
     vert = QStringLiteral("uniform mat4 %1;\n"
                           "\n"
@@ -130,7 +130,7 @@ QString MathNodeBase::GetShaderUniformType(const olive::NodeValue::Type &type)
 QString MathNodeBase::GetShaderVariableCall(const QString &input_id, const NodeValue::Type &type, const QString& coord_op)
 {
   if (type == NodeValue::kTexture) {
-    return QStringLiteral("texture2D(%1, ove_texcoord%2)").arg(input_id, coord_op);
+    return QStringLiteral("texture(%1, ove_texcoord%2)").arg(input_id, coord_op);
   }
 
   return input_id;
diff --git a/app/shaders/blur.frag b/app/shaders/blur.frag
index 319ed8ea0..e0378a4bf 100644
--- a/app/shaders/blur.frag
+++ b/app/shaders/blur.frag
@@ -64,7 +64,7 @@ void main(void) {
     int mode = determine_mode();
 
     if (mode == MODE_NONE) {
-        frag_color = texture2D(tex_in, ove_texcoord);
+        frag_color = texture(tex_in, ove_texcoord);
         return;
     }
 
@@ -116,7 +116,7 @@ void main(void) {
                 && pixel_coord.x < 1.0
                 && pixel_coord.y >= 0.0
                 && pixel_coord.y < 1.0)) {
-            composite += texture2D(tex_in, pixel_coord) * weight;
+            composite += texture(tex_in, pixel_coord) * weight;
         }
     }
 
diff --git a/app/shaders/colormanage.frag b/app/shaders/colormanage.frag
index dc0be4a45..e9461e71e 100644
--- a/app/shaders/colormanage.frag
+++ b/app/shaders/colormanage.frag
@@ -36,7 +36,7 @@ void main() {
     return;
   }
 
-  vec4 col = texture2D(ove_maintex, cropped_coord);
+  vec4 col = texture(ove_maintex, cropped_coord);
 
   // If alpha is associated, de-associate now
   if (ove_maintex_alpha == ALPHA_ASSOC) {
diff --git a/app/shaders/cornerpin.frag b/app/shaders/cornerpin.frag
index ce688b669..2255c2d23 100644
--- a/app/shaders/cornerpin.frag
+++ b/app/shaders/cornerpin.frag
@@ -18,7 +18,7 @@ float Wedge2D(vec2 v, vec2 w) {
 
 void main() {
     if(perspective_in){
-        frag_color = texture2D(tex_in, ove_texcoord);
+        frag_color = texture(tex_in, ove_texcoord);
     } else {
       float A = Wedge2D(b2, b3);
     float B = Wedge2D(b3, q) - Wedge2D(b1, b2);
@@ -44,6 +44,6 @@ void main() {
 
     uv.y = 1.0 - uv.y;
 
-    frag_color = texture2D(tex_in, uv);
+    frag_color = texture(tex_in, uv);
   }
 }
diff --git a/app/shaders/crop.frag b/app/shaders/crop.frag
index b022f9959..79970b30b 100644
--- a/app/shaders/crop.frag
+++ b/app/shaders/crop.frag
@@ -45,7 +45,7 @@ void main() {
     }
 
     if (multiplier > 0.0) {
-        vec4 color = texture2D(tex_in, ove_texcoord) * multiplier;
+        vec4 color = texture(tex_in, ove_texcoord) * multiplier;
         frag_color = color;
     } else {
         frag_color = vec4(0.0);
diff --git a/app/shaders/crossdissolve.frag b/app/shaders/crossdissolve.frag
index e15c7b8d0..3a3534cfc 100644
--- a/app/shaders/crossdissolve.frag
+++ b/app/shaders/crossdissolve.frag
@@ -27,11 +27,11 @@ void main(void) {
     vec4 composite = vec4(0.0);
 
     if (out_block_in_enabled) {
-        composite += texture2D(out_block_in, ove_texcoord) * TransformCurve(1.0 - ove_tprog_all);
+        composite += texture(out_block_in, ove_texcoord) * TransformCurve(1.0 - ove_tprog_all);
     }
 
     if (in_block_in_enabled) {
-        composite += texture2D(in_block_in, ove_texcoord) * TransformCurve(ove_tprog_all);
+        composite += texture(in_block_in, ove_texcoord) * TransformCurve(ove_tprog_all);
     }
 
     frag_color = composite;
diff --git a/app/shaders/default.frag b/app/shaders/default.frag
index ee738debf..4ff806e9a 100644
--- a/app/shaders/default.frag
+++ b/app/shaders/default.frag
@@ -6,6 +6,6 @@ in vec2 ove_texcoord;
 out vec4 frag_color;
 
 void main() {
-    vec4 color = texture2D(ove_maintex, ove_texcoord);
+    vec4 color = texture(ove_maintex, ove_texcoord);
     frag_color = color;
 }
diff --git a/app/shaders/deinterlace.frag b/app/shaders/deinterlace.frag
index ea4fcbe0b..b85e2b2d8 100644
--- a/app/shaders/deinterlace.frag
+++ b/app/shaders/deinterlace.frag
@@ -19,6 +19,6 @@ void main() {
     float half_vert = round(resolution_in.y / 2.0);
     using_texcoord.y = (round(using_texcoord.y * half_vert) + 0.25) / half_vert;
 
-    vec4 color = texture2D(ove_maintex, using_texcoord);
+    vec4 color = texture(ove_maintex, using_texcoord);
     frag_color = color;
 }
diff --git a/app/shaders/diptoblack.frag b/app/shaders/diptoblack.frag
index f2d6ffcfd..30a9c918d 100644
--- a/app/shaders/diptoblack.frag
+++ b/app/shaders/diptoblack.frag
@@ -13,14 +13,14 @@ out vec4 frag_color;
 
 void main(void) {
     if (out_block_in_enabled && in_block_in_enabled) {
-        vec4 out_block_col = mix(texture2D(out_block_in, ove_texcoord), color_in, ove_tprog_out);
-        vec4 in_block_col = mix(texture2D(in_block_in, ove_texcoord), color_in, 1.0 - ove_tprog_in);
+        vec4 out_block_col = mix(texture(out_block_in, ove_texcoord), color_in, ove_tprog_out);
+        vec4 in_block_col = mix(texture(in_block_in, ove_texcoord), color_in, 1.0 - ove_tprog_in);
 
         frag_color = out_block_col + in_block_col;
     } else if (out_block_in_enabled) {
-        frag_color = mix(texture2D(out_block_in, ove_texcoord), color_in, ove_tprog_all);
+        frag_color = mix(texture(out_block_in, ove_texcoord), color_in, ove_tprog_all);
     } else if (in_block_in_enabled) {
-        frag_color = mix(texture2D(in_block_in, ove_texcoord), color_in, 1.0 - ove_tprog_all);
+        frag_color = mix(texture(in_block_in, ove_texcoord), color_in, 1.0 - ove_tprog_all);
     } else {
         frag_color = vec4(0.0);
     }
diff --git a/app/shaders/flip.frag b/app/shaders/flip.frag
index 2cbaa7671..1da073c9e 100644
--- a/app/shaders/flip.frag
+++ b/app/shaders/flip.frag
@@ -7,7 +7,7 @@ out vec4 frag_color;
 
 void main(void) {
     if (!horiz_in && !vert_in) {
-        frag_color = texture2D(tex_in, ove_texcoord);
+        frag_color = texture(tex_in, ove_texcoord);
         return;
     }
 
@@ -16,5 +16,5 @@ void main(void) {
     if (horiz_in) new_coord.x = 1.0 - new_coord.x;
     if (vert_in) new_coord.y = 1.0 - new_coord.y;
 
-    frag_color = texture2D(tex_in, new_coord);
+    frag_color = texture(tex_in, new_coord);
 }
diff --git a/app/shaders/interlace.frag b/app/shaders/interlace.frag
index f459d4f4b..9edac96ce 100644
--- a/app/shaders/interlace.frag
+++ b/app/shaders/interlace.frag
@@ -9,8 +9,8 @@ void main() {
     float y_pixel = floor(ove_texcoord.y * resolution_in.y);
 
     if (mod(y_pixel, 2.0) == 0.0) {
-      frag_color = texture2D(top_tex_in, ove_texcoord);
+      frag_color = texture(top_tex_in, ove_texcoord);
     } else {
-      frag_color = texture2D(bottom_tex_in, ove_texcoord);
+      frag_color = texture(bottom_tex_in, ove_texcoord);
     }
 }
diff --git a/app/shaders/mosaic.frag b/app/shaders/mosaic.frag
index b9c2644a7..723353a96 100644
--- a/app/shaders/mosaic.frag
+++ b/app/shaders/mosaic.frag
@@ -24,6 +24,6 @@ void main() {
     y = ove_texcoord.y;
   }
 
-  vec4 color = texture2D(tex_in, vec2(x, y));
+  vec4 color = texture(tex_in, vec2(x, y));
   frag_color = color;
 }
diff --git a/app/shaders/rgbhistogram.frag b/app/shaders/rgbhistogram.frag
index 845806000..b4ef1fb9a 100644
--- a/app/shaders/rgbhistogram.frag
+++ b/app/shaders/rgbhistogram.frag
@@ -14,7 +14,7 @@ void main(void) {
 
     for (int i = 0; float(i) < histogram_width; i++) {
         ratio = float(i) / float(histogram_width - 1.0);
-        cur_col = texture2D(
+        cur_col = texture(
             ove_maintex,
             vec2(ove_texcoord.y, ratio)
         ).rgb;
diff --git a/app/shaders/rgbhistogram_secondary.frag b/app/shaders/rgbhistogram_secondary.frag
index 4cef66372..57d114ed2 100644
--- a/app/shaders/rgbhistogram_secondary.frag
+++ b/app/shaders/rgbhistogram_secondary.frag
@@ -18,7 +18,7 @@ void main(void) {
 
     for (int i = 0; float(i) < histogram_height; i++) {
         ratio = float(i) / float(histogram_height - 1.0);
-        sum += texture2D(
+        sum += texture(
             ove_maintex,
             vec2(ove_texcoord.x, ratio)
         ).rgb;
diff --git a/app/shaders/rgbwaveform.frag b/app/shaders/rgbwaveform.frag
index d39ff4ab7..cb3a00830 100644
--- a/app/shaders/rgbwaveform.frag
+++ b/app/shaders/rgbwaveform.frag
@@ -18,7 +18,7 @@ void main(void) {
 
     for (int i = 0; float(i) < waveform_height; i++) {
         ratio = float(i) / float(waveform_height - 1.0);
-        cur_col.rgb = texture2D(
+        cur_col.rgb = texture(
             ove_maintex,
             vec2(ove_texcoord.x, ratio)
         ).rgb;
diff --git a/app/shaders/stroke.frag b/app/shaders/stroke.frag
index 1f286327b..6827ec9c4 100644
--- a/app/shaders/stroke.frag
+++ b/app/shaders/stroke.frag
@@ -13,7 +13,7 @@ in vec2 ove_texcoord;
 out vec4 frag_color;
 
 void main(void) {
-    vec4 pixel_here = texture2D(tex_in, ove_texcoord);
+    vec4 pixel_here = texture(tex_in, ove_texcoord);
 
     // Detect no-op situations
     if (radius_in == 0.0
@@ -38,7 +38,7 @@ void main(void) {
 
             if (abs(length(vec2(i, j))) < radius) {
                 // Get pixel here
-                float alpha = texture2D(tex_in, ove_texcoord + vec2(x_coord, y_coord)).a;
+                float alpha = texture(tex_in, ove_texcoord + vec2(x_coord, y_coord)).a;
 
                 if (inner_in) {
                     alpha = 1.0 - alpha;