Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
21856fbd
Commit
21856fbd
authored
Jun 04, 2003
by
Lionel Ulmer
Committed by
Alexandre Julliard
Jun 04, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- implement FB => Texture blits
- fix compilation on non-recent glext.h systems
parent
e4882b15
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
8 deletions
+10
-8
mesa.c
dlls/ddraw/d3ddevice/mesa.c
+1
-1
d3dtexture.c
dlls/ddraw/d3dtexture.c
+0
-0
gl_api.h
dlls/ddraw/gl_api.h
+1
-0
gl_private.h
dlls/ddraw/gl_private.h
+1
-0
mesa_private.h
dlls/ddraw/mesa_private.h
+7
-7
No files found.
dlls/ddraw/d3ddevice/mesa.c
View file @
21856fbd
...
...
@@ -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/d3dtexture.c
View file @
21856fbd
This diff is collapsed.
Click to expand it.
dlls/ddraw/gl_api.h
View file @
21856fbd
...
...
@@ -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
View file @
21856fbd
...
...
@@ -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
View file @
21856fbd
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment