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
b98a7b50
Commit
b98a7b50
authored
Oct 18, 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 LoadLocation.
parent
e5ed8edb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
surface.c
dlls/wined3d/surface.c
+3
-1
No files found.
dlls/wined3d/surface.c
View file @
b98a7b50
...
...
@@ -4420,7 +4420,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D
if
(
!
device
->
isInDraw
)
ActivateContext
(
device
,
device
->
lastActiveRenderTarget
,
CTXUSAGE_RESOURCELOAD
);
surface_bind_and_dirtify
(
This
);
ENTER_GL
();
/* The only place where LoadTexture() might get called when isInDraw=1
* is ActivateContext where lastActiveRenderTarget is preloaded.
...
...
@@ -4472,7 +4471,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D
}
/* Make sure the correct pitch is used */
ENTER_GL
();
glPixelStorei
(
GL_UNPACK_ROW_LENGTH
,
width
);
LEAVE_GL
();
if
((
This
->
Flags
&
SFLAG_NONPOW2
)
&&
!
(
This
->
Flags
&
SFLAG_OVERSIZE
))
{
TRACE
(
"non power of two support
\n
"
);
...
...
@@ -4495,6 +4496,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D
}
/* Restore the default pitch */
ENTER_GL
();
glPixelStorei
(
GL_UNPACK_ROW_LENGTH
,
0
);
LEAVE_GL
();
...
...
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