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
f87c54f1
Commit
f87c54f1
authored
Jun 04, 2003
by
Lionel Ulmer
Committed by
Alexandre Julliard
Jun 04, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some threading fixes (prevents some dead-locks).
parent
21856fbd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
mesa.c
dlls/ddraw/d3ddevice/mesa.c
+7
-1
d3dtexture.c
dlls/ddraw/d3dtexture.c
+1
-0
No files found.
dlls/ddraw/d3ddevice/mesa.c
View file @
f87c54f1
...
...
@@ -1666,6 +1666,8 @@ GL_IDirect3DDeviceImpl_7_3T_SetTextureStageState(LPDIRECT3DDEVICE7 iface,
This
->
state_block
.
texture_stage_state
[
dwStage
][
D3DTSS_ADDRESSU
-
1
]
=
dwState
;
This
->
state_block
.
texture_stage_state
[
dwStage
][
D3DTSS_ADDRESSV
-
1
]
=
dwState
;
}
ENTER_GL
();
switch
(
d3dTexStageStateType
)
{
case
D3DTSS_MINFILTER
:
...
...
@@ -2006,7 +2008,9 @@ GL_IDirect3DDeviceImpl_7_3T_SetTextureStageState(LPDIRECT3DDEVICE7 iface,
FIXME
(
" Unhandled stage type : %s => %08lx
\n
"
,
type
,
dwState
);
break
;
}
LEAVE_GL
();
return
DD_OK
;
}
...
...
@@ -3016,7 +3020,9 @@ static void d3ddevice_flush_to_frame_buffer(IDirect3DDeviceImpl *d3d_dev, LPCREC
glTexParameteri
(
GL_TEXTURE_2D
,
GL_TEXTURE_MAG_FILTER
,
max_tex
);
glTexParameteri
(
GL_TEXTURE_2D
,
GL_TEXTURE_MIN_FILTER
,
min_tex
);
glTexEnvi
(
GL_TEXTURE_ENV
,
GL_TEXTURE_ENV_MODE
,
tex_env
);
LEAVE_GL
();
d3d_dev
->
matrices_updated
(
d3d_dev
,
TEXMAT0_CHANGED
);
ENTER_GL
();
#if 0
/* I keep this code here as it's very useful to debug :-) */
{
...
...
dlls/ddraw/d3dtexture.c
View file @
f87c54f1
...
...
@@ -723,6 +723,7 @@ gltex_bltfast(IDirectDrawSurfaceImpl *surf_ptr, DWORD dstx,
glReadBuffer
(
GL_BACK
);
else
{
ERR
(
"Wrong surface type for locking !
\n
"
);
glBindTexture
(
GL_TEXTURE_2D
,
cur_tex
);
LEAVE_GL
();
return
DDERR_INVALIDPARAMS
;
}
...
...
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