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
7f6ab3c0
Commit
7f6ab3c0
authored
Apr 15, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 16, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: The currentDesc and pow2 width/height are the same for power of two textures.
parent
65797d7f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
16 deletions
+4
-16
surface.c
dlls/wined3d/surface.c
+4
-16
No files found.
dlls/wined3d/surface.c
View file @
7f6ab3c0
...
...
@@ -4515,22 +4515,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D
glPixelStorei
(
GL_UNPACK_ROW_LENGTH
,
width
);
LEAVE_GL
();
if
(
This
->
Flags
&
SFLAG_NONPOW2
)
{
TRACE
(
"non power of two support
\n
"
);
if
(
mem
||
(
This
->
Flags
&
SFLAG_PBO
))
{
surface_upload_data
(
This
,
gl_info
,
&
desc
,
srgb
,
This
->
currentDesc
.
Width
,
This
->
currentDesc
.
Height
,
mem
);
}
}
else
{
/* When making the realloc conditional, keep in mind that GL_APPLE_client_storage may be in use, and This->resource.allocatedMemory
* changed. So also keep track of memory changes. In this case the texture has to be reallocated
*/
if
(
mem
||
(
This
->
Flags
&
SFLAG_PBO
))
{
surface_upload_data
(
This
,
gl_info
,
&
desc
,
srgb
,
This
->
pow2Width
,
This
->
pow2Height
,
mem
);
}
if
(
mem
||
(
This
->
Flags
&
SFLAG_PBO
))
{
surface_upload_data
(
This
,
gl_info
,
&
desc
,
srgb
,
This
->
currentDesc
.
Width
,
This
->
currentDesc
.
Height
,
mem
);
}
/* Restore the default pitch */
...
...
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