summaryrefslogtreecommitdiff
path: root/gfx/gl/shaders
diff options
context:
space:
mode:
Diffstat (limited to 'gfx/gl/shaders')
-rw-r--r--gfx/gl/shaders/dynamicPoint.vs (renamed from gfx/gl/shaders/basicShader.vs)0
-rw-r--r--gfx/gl/shaders/fixedPoint.vs (renamed from gfx/gl/shaders/landmassShader.vs)0
-rw-r--r--gfx/gl/shaders/landmass.fs (renamed from gfx/gl/shaders/landmassShader.fs)2
-rw-r--r--gfx/gl/shaders/lighting.fs (renamed from gfx/gl/shaders/lightingShader.fs)0
-rw-r--r--gfx/gl/shaders/lighting.vs (renamed from gfx/gl/shaders/lightingShader.vs)0
-rw-r--r--gfx/gl/shaders/material.fs (renamed from gfx/gl/shaders/basicShader.fs)2
-rw-r--r--gfx/gl/shaders/materialOut.glsl (renamed from gfx/gl/shaders/geometryOut.glsl)0
-rw-r--r--gfx/gl/shaders/water.fs (renamed from gfx/gl/shaders/waterShader.fs)2
-rw-r--r--gfx/gl/shaders/water.vs (renamed from gfx/gl/shaders/waterShader.vs)0
9 files changed, 3 insertions, 3 deletions
diff --git a/gfx/gl/shaders/basicShader.vs b/gfx/gl/shaders/dynamicPoint.vs
index e1701ed..e1701ed 100644
--- a/gfx/gl/shaders/basicShader.vs
+++ b/gfx/gl/shaders/dynamicPoint.vs
diff --git a/gfx/gl/shaders/landmassShader.vs b/gfx/gl/shaders/fixedPoint.vs
index 0cc8153..0cc8153 100644
--- a/gfx/gl/shaders/landmassShader.vs
+++ b/gfx/gl/shaders/fixedPoint.vs
diff --git a/gfx/gl/shaders/landmassShader.fs b/gfx/gl/shaders/landmass.fs
index f3cc3e8..4dc92bb 100644
--- a/gfx/gl/shaders/landmassShader.fs
+++ b/gfx/gl/shaders/landmass.fs
@@ -1,7 +1,7 @@
#version 330 core
include(`materialInterface.glsl')
-include(`geometryOut.glsl')
+include(`materialOut.glsl')
uniform sampler2D texture0;
diff --git a/gfx/gl/shaders/lightingShader.fs b/gfx/gl/shaders/lighting.fs
index 4646b75..4646b75 100644
--- a/gfx/gl/shaders/lightingShader.fs
+++ b/gfx/gl/shaders/lighting.fs
diff --git a/gfx/gl/shaders/lightingShader.vs b/gfx/gl/shaders/lighting.vs
index e07cd0a..e07cd0a 100644
--- a/gfx/gl/shaders/lightingShader.vs
+++ b/gfx/gl/shaders/lighting.vs
diff --git a/gfx/gl/shaders/basicShader.fs b/gfx/gl/shaders/material.fs
index 57eaba2..cafb35d 100644
--- a/gfx/gl/shaders/basicShader.fs
+++ b/gfx/gl/shaders/material.fs
@@ -2,7 +2,7 @@
#extension GL_ARB_shading_language_420pack : enable
include(`materialInterface.glsl')
-include(`geometryOut.glsl')
+include(`materialOut.glsl')
layout(binding = 0) uniform sampler2D texture0;
layout(binding = 1) uniform usampler2DRect material;
diff --git a/gfx/gl/shaders/geometryOut.glsl b/gfx/gl/shaders/materialOut.glsl
index dc5f8e8..dc5f8e8 100644
--- a/gfx/gl/shaders/geometryOut.glsl
+++ b/gfx/gl/shaders/materialOut.glsl
diff --git a/gfx/gl/shaders/waterShader.fs b/gfx/gl/shaders/water.fs
index 5936da4..04aa94c 100644
--- a/gfx/gl/shaders/waterShader.fs
+++ b/gfx/gl/shaders/water.fs
@@ -2,7 +2,7 @@
#extension GL_ARB_shading_language_420pack : enable
include(`materialInterface.glsl')
-include(`geometryOut.glsl')
+include(`materialOut.glsl')
uniform sampler2D texture0;
uniform vec3 waves;
diff --git a/gfx/gl/shaders/waterShader.vs b/gfx/gl/shaders/water.vs
index a21b49f..a21b49f 100644
--- a/gfx/gl/shaders/waterShader.vs
+++ b/gfx/gl/shaders/water.vs