[Scummvm-git-logs] scummvm master -> 3dd3e76bc2867874e870d96aab32da4bde959afd

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3dd3e76bc2 BACKENDS3D: Shader code files shouldn't be moved


Commit: 3dd3e76bc2867874e870d96aab32da4bde959afd
    https://github.com/scummvm/scummvm/commit/3dd3e76bc2867874e870d96aab32da4bde959afd
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-01-10T02:38:44+01:00

Commit Message:
BACKENDS3D: Shader code files shouldn't be moved

Changed paths:
  A graphics/opengl/box_shaders.cpp
  A graphics/opengl/compat_shaders.cpp
  A graphics/opengl/control_shaders.cpp
  R backends/graphics3d/opengl/box_shaders.cpp
  R backends/graphics3d/opengl/compat_shaders.cpp
  R backends/graphics3d/opengl/control_shaders.cpp
    backends/module.mk
    graphics/module.mk


diff --git a/backends/module.mk b/backends/module.mk
index 4a010b4deff..4b306b8a416 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -159,9 +159,6 @@ endif
 ifdef USE_OPENGL
 MODULE_OBJS += \
 	graphics/openglsdl/openglsdl-graphics.o \
-	graphics3d/opengl/box_shaders.o \
-	graphics3d/opengl/control_shaders.o \
-	graphics3d/opengl/compat_shaders.o \
 	graphics3d/opengl/framebuffer.o \
 	graphics3d/opengl/surfacerenderer.o \
 	graphics3d/opengl/texture.o \
diff --git a/graphics/module.mk b/graphics/module.mk
index 70ec14520ca..5c8686f6b1d 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -29,7 +29,10 @@ MODULE_OBJS := \
 	macgui/macwindowmanager.o \
 	managed_surface.o \
 	nine_patch.o \
+	opengl/box_shaders.o \
 	opengl/context.o \
+	opengl/control_shaders.o \
+	opengl/compat_shaders.o \
 	opengl/shader.o \
 	pixelformat.o \
 	primitives.o \
diff --git a/backends/graphics3d/opengl/box_shaders.cpp b/graphics/opengl/box_shaders.cpp
similarity index 100%
rename from backends/graphics3d/opengl/box_shaders.cpp
rename to graphics/opengl/box_shaders.cpp
diff --git a/backends/graphics3d/opengl/compat_shaders.cpp b/graphics/opengl/compat_shaders.cpp
similarity index 100%
rename from backends/graphics3d/opengl/compat_shaders.cpp
rename to graphics/opengl/compat_shaders.cpp
diff --git a/backends/graphics3d/opengl/control_shaders.cpp b/graphics/opengl/control_shaders.cpp
similarity index 100%
rename from backends/graphics3d/opengl/control_shaders.cpp
rename to graphics/opengl/control_shaders.cpp