Henri Verbeet : wined3d: wined3d_gl.h should be internal to wined3d.
Alexandre Julliard
julliard at winehq.org
Thu Nov 20 08:20:47 CST 2008
Module: wine
Branch: master
Commit: 8899f3412b220adf7c7ba99fb5028b6e0ef9e48a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8899f3412b220adf7c7ba99fb5028b6e0ef9e48a
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Nov 20 13:32:00 2008 +0100
wined3d: wined3d_gl.h should be internal to wined3d.
---
{include/wine => dlls/wined3d}/wined3d_gl.h | 20 ++++++++++----------
dlls/wined3d/wined3d_private.h | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/wine/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
similarity index 99%
rename from include/wine/wined3d_gl.h
rename to dlls/wined3d/wined3d_gl.h
index 6036688..4dba7d2 100644
--- a/include/wine/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -1965,8 +1965,8 @@ typedef void (WINE_GLAPI * PGLFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint le
/* GL_EXT_texture_env_dot3 */
#ifndef GL_EXT_texture_env_dot3
#define GL_EXT_texture_env_dot3 1
-#define GL_DOT3_RGB_EXT 0x8740
-#define GL_DOT3_RGBA_EXT 0x8741
+#define GL_DOT3_RGB_EXT 0x8740
+#define GL_DOT3_RGBA_EXT 0x8741
#endif
/* GL_EXT_texture_lod_bias */
#ifndef GL_EXT_texture_lod_bias
@@ -2740,7 +2740,7 @@ typedef void (WINE_GLAPI * PGLFNGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage
#endif
/**
- * Point sprites
+ * Point sprites
*/
/* GL_ARB_point_sprite */
#ifndef GL_ARB_point_sprite
@@ -2749,11 +2749,11 @@ typedef void (WINE_GLAPI * PGLFNGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage
#define GL_COORD_REPLACE_ARB 0x8862
#endif
/**
- * @TODO: GL_NV_point_sprite
+ * @TODO: GL_NV_point_sprite
*/
/**
- * Occlusion Queries
+ * Occlusion Queries
*/
/* GL_ARB_occlusion_query */
#ifndef GL_ARB_occlusion_query
@@ -3192,8 +3192,8 @@ typedef void (WINE_GLAPI * PGLFNVERTEXATTRIBPOINTERPROC) (GLuint index, GLint si
/****************************************************
- * OpenGL Official Version
- * defines
+ * OpenGL Official Version
+ * defines
****************************************************/
/* GL_VERSION_1_3 */
#if !defined(GL_DOT3_RGBA)
@@ -3396,7 +3396,7 @@ typedef enum _GL_SupportedExt {
/****************************************************
- * #Defines
+ * #Defines
****************************************************/
#define GL_EXT_FUNCS_GEN \
/** ARB Extensions **/ \
@@ -3809,7 +3809,7 @@ typedef BOOL (WINAPI * WINED3D_PFNWGLSETPIXELFORMATWINE) (HDC hdc, int iPixelFor
/****************************************************
- * Structures
+ * Structures
****************************************************/
typedef struct {
@@ -3840,7 +3840,7 @@ typedef struct _WineD3D_GL_Info {
DWORD driver_version_hipart;
CHAR gl_renderer[255];
/**
- * CAPS Constants
+ * CAPS Constants
*/
UINT max_buffers;
UINT max_lights;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index ae7e3df..c3fdf38 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -40,7 +40,7 @@
#include "wined3d_private_types.h"
#include "wine/wined3d_interface.h"
#include "wine/wined3d_caps.h"
-#include "wine/wined3d_gl.h"
+#include "wined3d_gl.h"
#include "wine/list.h"
/* Hash table functions */
More information about the wine-cvs
mailing list