Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
b54553a2
Commit
b54553a2
authored
Apr 03, 2008
by
Alexander Dorofeyev
Committed by
Alexandre Julliard
Apr 03, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Avoid calling LoadTexture with gl lock held in IWineD3DSurfaceImpl_PreLoad.
Needed to prevent ActivateContext being called while holding gl lock.
parent
1e6f02ed
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
surface.c
dlls/wined3d/surface.c
+4
-1
No files found.
dlls/wined3d/surface.c
View file @
b54553a2
...
...
@@ -509,19 +509,22 @@ void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) {
}
glBindTexture
(
This
->
glDescription
.
target
,
This
->
glDescription
.
textureName
);
checkGLcall
(
"glBindTexture"
);
LEAVE_GL
();
IWineD3DSurface_LoadTexture
(
iface
,
FALSE
);
/* This is where we should be reducing the amount of GLMemoryUsed */
}
else
if
(
This
->
glDescription
.
textureName
)
{
/* NOTE: the level 0 surface of a mpmapped texture must be loaded first! */
/* assume this is a coding error not a real error for now */
FIXME
(
"Mipmap surface has a glTexture bound to it!
\n
"
);
LEAVE_GL
();
}
if
(
This
->
resource
.
pool
==
WINED3DPOOL_DEFAULT
)
{
/* Tell opengl to try and keep this texture in video ram (well mostly) */
GLclampf
tmp
;
tmp
=
0
.
9
f
;
ENTER_GL
();
glPrioritizeTextures
(
1
,
&
This
->
glDescription
.
textureName
,
&
tmp
);
LEAVE_GL
();
}
LEAVE_GL
();
}
return
;
}
...
...
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