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
bc2850a5
Commit
bc2850a5
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: Get rid of the width and height parameters to surface_upload_data().
parent
212bfab2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
surface.c
dlls/wined3d/surface.c
+4
-5
No files found.
dlls/wined3d/surface.c
View file @
bc2850a5
...
...
@@ -720,8 +720,10 @@ static void surface_download_data(IWineD3DSurfaceImpl *This, const struct wined3
* correct texture. */
/* Context activation is done by the caller. */
static
void
surface_upload_data
(
IWineD3DSurfaceImpl
*
This
,
const
struct
wined3d_gl_info
*
gl_info
,
const
struct
wined3d_format_desc
*
format_desc
,
BOOL
srgb
,
GLsizei
width
,
GLsizei
height
,
const
GLvoid
*
data
)
const
struct
wined3d_format_desc
*
format_desc
,
BOOL
srgb
,
const
GLvoid
*
data
)
{
GLsizei
width
=
This
->
currentDesc
.
Width
;
GLsizei
height
=
This
->
currentDesc
.
Height
;
GLenum
internal
;
if
(
srgb
)
...
...
@@ -4517,10 +4519,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D
LEAVE_GL
();
if
(
mem
||
(
This
->
Flags
&
SFLAG_PBO
))
{
surface_upload_data
(
This
,
gl_info
,
&
desc
,
srgb
,
This
->
currentDesc
.
Width
,
This
->
currentDesc
.
Height
,
mem
);
}
surface_upload_data
(
This
,
gl_info
,
&
desc
,
srgb
,
mem
);
/* Restore the default pitch */
ENTER_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