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
1ae45f47
Commit
1ae45f47
authored
Oct 23, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Oct 23, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of the "format_id" parameter to buffer_init().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ee7c6c2a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
buffer.c
dlls/wined3d/buffer.c
+5
-5
No files found.
dlls/wined3d/buffer.c
View file @
1ae45f47
...
...
@@ -1341,11 +1341,11 @@ static GLenum buffer_type_hint_from_bind_flags(const struct wined3d_gl_info *gl_
return
GL_ARRAY_BUFFER
;
}
static
HRESULT
buffer_init
(
struct
wined3d_buffer
*
buffer
,
struct
wined3d_device
*
device
,
UINT
size
,
DWORD
usage
,
enum
wined3d_format_id
format_id
,
unsigned
int
access
,
unsigned
int
bind_flags
,
const
struct
wined3d_sub_resource_data
*
data
,
void
*
parent
,
const
struct
wined3d_parent_ops
*
parent_ops
)
static
HRESULT
buffer_init
(
struct
wined3d_buffer
*
buffer
,
struct
wined3d_device
*
device
,
UINT
size
,
DWORD
usage
,
unsigned
int
access
,
unsigned
int
bind_flags
,
const
struct
wined3d_sub_resource_data
*
data
,
void
*
parent
,
const
struct
wined3d_parent_ops
*
parent_ops
)
{
const
struct
wined3d_format
*
format
=
wined3d_get_format
(
device
->
adapter
,
format_id
,
usage
);
const
struct
wined3d_format
*
format
=
wined3d_get_format
(
device
->
adapter
,
WINED3DFMT_UNKNOWN
,
usage
);
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
struct
wined3d_resource
*
resource
=
&
buffer
->
resource
;
BOOL
dynamic_buffer_ok
;
...
...
@@ -1454,7 +1454,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
if
(
FAILED
(
hr
=
buffer_init
(
object
,
device
,
desc
->
byte_width
,
desc
->
usage
,
WINED3DFMT_UNKNOWN
,
if
(
FAILED
(
hr
=
buffer_init
(
object
,
device
,
desc
->
byte_width
,
desc
->
usage
,
desc
->
access
,
desc
->
bind_flags
,
data
,
parent
,
parent_ops
)))
{
WARN
(
"Failed to initialize buffer, hr %#x.
\n
"
,
hr
);
...
...
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