Fix a missing newline in system vars mismatch warning.

[xonotic/darkplaces.git] / r_textures.h

diff --git a/r_textures.h b/r_textures.h
index e9c9aabae86c5ee0bbcfe7f5e843d0c7b8b3eac1..4450e31bbd23463ebe37faa4a7af011f7b7f2733 100644 (file)
--- a/r_textures.h
+++ b/r_textures.h
@@ -39,6 +39,9 @@
 
 typedef enum textype_e
 {
+       // placeholder for unused textures in r_rendertarget_t
+       TEXTYPE_UNUSED,
+
        // 8bit paletted
        TEXTYPE_PALETTE,
        // 32bit RGBA
@@ -56,6 +59,9 @@ typedef enum textype_e
        // 4x4 block compressed 15bit color plus 8bit alpha (8 bits per pixel)
        TEXTYPE_DXT5,
 
+       // default compressed type for GLES2
+       TEXTYPE_ETC1,
+
        // 8bit paletted in sRGB colorspace
        TEXTYPE_SRGB_PALETTE,
        // 32bit RGBA in sRGB colorspace
@@ -94,16 +100,6 @@ typedef enum textype_e
 }
 textype_t;
 
-/*
-#ifdef WIN32
-#define SUPPORTD3D
-#define SUPPORTDIRECTX
-#ifdef SUPPORTD3D
-#include <d3d9.h>
-#endif
-#endif
-*/
-
 // contents of this structure are mostly private to gl_textures.c
 typedef struct rtexture_s
 {
@@ -113,25 +109,6 @@ typedef struct rtexture_s
        qboolean dirty; // indicates that R_RealGetTexture should be called
        qboolean glisdepthstencil; // indicates that FBO attachment has to be GL_DEPTH_STENCIL_ATTACHMENT
        int gltexturetypeenum; // used by R_Mesh_TexBind
-       // d3d stuff the backend needs
-       void *d3dtexture;
-       void *d3dsurface;
-#ifdef SUPPORTD3D
-       qboolean d3disrendertargetsurface;
-       qboolean d3disdepthstencilsurface;
-       int d3dformat;
-       int d3dusage;
-       int d3dpool;
-       int d3daddressu;
-       int d3daddressv;
-       int d3daddressw;
-       int d3dmagfilter;
-       int d3dminfilter;
-       int d3dmipfilter;
-       int d3dmaxmiplevelfilter;
-       int d3dmipmaplodbias;
-       int d3dmaxmiplevel;
-#endif
 }
 rtexture_t;