- implement FB => Texture blits

- fix compilation on non-recent glext.h systems

dlls/ddraw/d3ddevice/mesa.c

@@ -1824,7 +1824,7 @@ GL_IDirect3DDeviceImpl_7_3T_SetTextureStageState(LPDIRECT3DDEVICE7 iface,
 			    case D3DTOP_BLENDCURRENTALPHA: src = GL_PREVIOUS_EXT;
 			}
 			
-			glTexEnvi(GL_TEXTURE_ENV, parm, GL_INTERPOLATE_ARB);
+			glTexEnvi(GL_TEXTURE_ENV, parm, GL_INTERPOLATE_EXT);
 			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_RGB_EXT, src);
 			glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB_EXT, GL_SRC_ALPHA);
 			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_ALPHA_EXT, src);

dlls/ddraw/gl_api.h

@@ -39,6 +39,7 @@ GL_API_FUNCTION(glColor3f)
 GL_API_FUNCTION(glColor3ub)
 GL_API_FUNCTION(glColor4ub)
 GL_API_FUNCTION(glColorMaterial)
+GL_API_FUNCTION(glCopyTexSubImage2D)
 GL_API_FUNCTION(glCullFace)
 GL_API_FUNCTION(glDeleteTextures)
 GL_API_FUNCTION(glDepthFunc)

dlls/ddraw/gl_private.h

@@ -63,6 +63,7 @@
 #define glColor3f pglColor3f
 #define glColor3ub pglColor3ub
 #define glColor4ub pglColor4ub
+#define glCopyTexSubImage2D pglCopyTexSubImage2D
 #define glColorMaterial pglColorMaterial
 #define glCullFace pglCullFace
 #define glDeleteTextures pglDeleteTextures

dlls/ddraw/mesa_private.h

@@ -39,6 +39,12 @@ extern void (*wine_tsx11_unlock_ptr)(void);
 
 extern const GUID IID_D3DDEVICE_OpenGL;
 
+typedef enum {
+    SURFACE_GL,
+    SURFACE_MEMORY,
+    SURFACE_MEMORY_DIRTY
+} SURFACE_STATE;
+
 typedef struct IDirect3DGLImpl
 {
     struct IDirect3DImpl parent;
@@ -60,7 +66,7 @@ typedef struct IDirect3DTextureGLImpl
 
     /* Texture upload management */
     BOOLEAN initial_upload_done;
-    BOOLEAN dirty_flag;
+    SURFACE_STATE dirty_flag;
 
     /* Surface optimization */
     void *surface_ptr;
@@ -79,12 +85,6 @@ typedef enum {
     GL_TRANSFORM_VERTEXBUFFER
 } GL_TRANSFORM_STATE;
 
-typedef enum {
-    SURFACE_GL,
-    SURFACE_MEMORY,
-    SURFACE_MEMORY_DIRTY
-} SURFACE_STATE;
-
 typedef struct IDirect3DDeviceGLImpl
 {
     struct IDirect3DDeviceImpl parent;