- moved gl_material into hwrenderer/.

src/CMakeLists.txt

@@ -1054,10 +1054,10 @@ set (PCH_SOURCES
 	gl/system/gl_wipe.cpp
 	gl/textures/gl_hwtexture.cpp
 	gl/textures/gl_texture.cpp
-	gl/textures/gl_material.cpp
 	gl/textures/gl_samplers.cpp
 	hwrenderer/data/flatvertices.cpp
 	hwrenderer/dynlights/hw_aabbtree.cpp
+	hwrenderer/textures/hw_material.cpp
 	
 	menu/joystickmenu.cpp
 	menu/loadsavemenu.cpp

src/gl/models/gl_models.cpp

@@ -35,13 +35,13 @@
 #include "d_player.h"
 #include "g_levellocals.h"
 #include "i_time.h"
+#include "hwrenderer/textures/hw_material.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/models/gl_models.h"
-#include "gl/textures/gl_material.h"
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/shaders/gl_shader.h"
 

src/gl/renderer/gl_renderstate.h

@@ -26,7 +26,7 @@
 #include <string.h>
 #include "gl/system/gl_interface.h"
 #include "r_data/matrix.h"
-#include "gl/textures/gl_material.h"
+#include "hwrenderer/textures/hw_material.h"
 #include "c_cvars.h"
 #include "r_defs.h"
 #include "r_data/r_translate.h"

src/gl/scene/gl_sky.cpp

@@ -31,7 +31,7 @@
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
-#include "gl/textures/gl_material.h"
+#include "hwrenderer/textures/hw_material.h"
 
 CVAR(Bool,gl_noskyboxes, false, 0)
 

src/gl/scene/gl_walls.cpp

@@ -31,6 +31,7 @@
 #include "doomdata.h"
 #include "g_levellocals.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
+#include "hwrenderer/textures/hw_material.h"
 
 #include "gl/system/gl_cvars.h"
 #include "gl/system/gl_interface.h"
@@ -38,7 +39,6 @@
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/textures/gl_material.h"
 #include "gl/utility/gl_clock.h"
 
 

src/gl/textures/gl_hwtexture.cpp

@@ -29,13 +29,13 @@
 #include "gl/system/gl_system.h"
 #include "templates.h"
 #include "c_cvars.h"
+#include "hwrenderer/textures/hw_material.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_colormap.h"
-#include "gl/textures/gl_material.h"
 #include "gl/textures/gl_samplers.h"
 
 

src/gl/textures/gl_samplers.cpp

@@ -28,7 +28,7 @@
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl_samplers.h"
-#include "gl_material.h"
+#include "hwrenderer/textures/hw_material.h"
 
 extern TexFilter_s TexFilter[];
 

src/gl/textures/gl_texture.cpp

@@ -32,10 +32,10 @@
 #include "r_state.h"
 #include "actor.h"
 #include "textures/skyboxtexture.h"
+#include "hwrenderer/textures/hw_material.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/renderer/gl_renderer.h"
-#include "gl/textures/gl_material.h"
 #include "gl/textures/gl_samplers.h"
 #include "gl/models/gl_models.h"
 

src/hwrenderer/textures/hw_ihwtexture.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <stdint.h>
+
+typedef TMap<int, bool> SpriteHits;
+
+class IHardwareTexture
+{
+public:
+	enum
+	{
+		MAX_TEXTURES = 16
+	};
+
+public:
+
+
+public:
+	IHardwareTexture() {}
+	virtual ~IHardwareTexture() {}
+
+	virtual void BindToFrameBuffer(int w, int h) = 0;
+	virtual bool BindOrCreate(FTexture *tex, int texunit, int clampmode, int translation, int flags) = 0;
+	virtual void AllocateBuffer(int w, int h, int texelsize) = 0;
+	virtual uint8_t *MapBuffer() = 0;
+	virtual unsigned int CreateTexture(unsigned char * buffer, int w, int h, int texunit, bool mipmap, int translation, const char *name) = 0;
+
+	virtual void Clean(bool all) = 0;
+	virtual void CleanUnused(SpriteHits &usedtranslations) = 0;
+};
+

src/hwrenderer/textures/hw_material.cpp

@@ -25,9 +25,8 @@
 #include "sbar.h"
 #include "stats.h"
 #include "r_utility.h"
-#include "hwrenderer/textures/hw_ihwtexture.h"
+#include "hw_ihwtexture.h"
-
+#include "hw_material.h"
-#include "gl_material.h"
 
 EXTERN_CVAR(Bool, gl_texture_usehires)