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
47372928
Commit
47372928
authored
Oct 19, 2008
by
Roderick Colenbrander
Committed by
Alexandre Julliard
Oct 20, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Fix recursive ENTER_GL in UpdateSurface.
parent
e848aed2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
device.c
dlls/wined3d/device.c
+4
-2
No files found.
dlls/wined3d/device.c
View file @
47372928
...
@@ -5880,11 +5880,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface,
...
@@ -5880,11 +5880,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface,
ActivateContext
(
This
,
This
->
lastActiveRenderTarget
,
CTXUSAGE_RESOURCELOAD
);
ActivateContext
(
This
,
This
->
lastActiveRenderTarget
,
CTXUSAGE_RESOURCELOAD
);
ENTER_GL
();
if
(
GL_SUPPORT
(
ARB_MULTITEXTURE
))
{
if
(
GL_SUPPORT
(
ARB_MULTITEXTURE
))
{
ENTER_GL
();
GL_EXTCALL
(
glActiveTextureARB
(
GL_TEXTURE0_ARB
));
GL_EXTCALL
(
glActiveTextureARB
(
GL_TEXTURE0_ARB
));
checkGLcall
(
"glActiveTextureARB"
);
checkGLcall
(
"glActiveTextureARB"
);
LEAVE_GL
();
}
}
/* Make sure the surface is loaded and up to date */
/* Make sure the surface is loaded and up to date */
...
@@ -5924,6 +5924,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface,
...
@@ -5924,6 +5924,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface,
FIXME
(
"Surfaces has no allocated memory, but should be an in memory only surface
\n
"
);
FIXME
(
"Surfaces has no allocated memory, but should be an in memory only surface
\n
"
);
}
}
ENTER_GL
();
/* TODO: Cube and volume support */
/* TODO: Cube and volume support */
if
(
rowoffset
!=
0
){
if
(
rowoffset
!=
0
){
/* not a whole row so we have to do it a line at a time */
/* not a whole row so we have to do it a line at a time */
...
...
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