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
90f4ae69
Commit
90f4ae69
authored
Apr 09, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove unused offset parameter in buffer_get_memory.
parent
8bfc89ee
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
buffer.c
dlls/wined3d/buffer.c
+4
-4
device.c
dlls/wined3d/device.c
+1
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/buffer.c
View file @
90f4ae69
...
...
@@ -612,7 +612,7 @@ static inline void fixup_transformed_pos(float *p)
}
/* Context activation is done by the caller. */
const
BYTE
*
buffer_get_memory
(
IWineD3DBuffer
*
iface
,
UINT
offset
,
GLuint
*
buffer_object
)
const
BYTE
*
buffer_get_memory
(
IWineD3DBuffer
*
iface
,
GLuint
*
buffer_object
)
{
struct
wined3d_buffer
*
This
=
(
struct
wined3d_buffer
*
)
iface
;
...
...
@@ -626,14 +626,14 @@ const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer
if
(
This
->
buffer_object
)
{
*
buffer_object
=
This
->
buffer_object
;
return
(
const
BYTE
*
)
offset
;
return
NULL
;
}
}
return
This
->
resource
.
allocatedMemory
+
offset
;
return
This
->
resource
.
allocatedMemory
;
}
else
{
return
(
const
BYTE
*
)
offset
;
return
NULL
;
}
}
...
...
dlls/wined3d/device.c
View file @
90f4ae69
...
...
@@ -213,7 +213,7 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This,
else
{
TRACE
(
"Stream %u isn't UP, %p
\n
"
,
element
->
input_slot
,
This
->
stateBlock
->
streamSource
[
element
->
input_slot
]);
data
=
buffer_get_memory
(
This
->
stateBlock
->
streamSource
[
element
->
input_slot
],
0
,
&
buffer_object
);
data
=
buffer_get_memory
(
This
->
stateBlock
->
streamSource
[
element
->
input_slot
],
&
buffer_object
);
/* Can't use vbo's if the base vertex index is negative. OpenGL doesn't accept negative offsets
* (or rather offsets bigger than the vbo, because the pointer is unsigned), so use system memory
...
...
dlls/wined3d/wined3d_private.h
View file @
90f4ae69
...
...
@@ -2526,7 +2526,7 @@ struct wined3d_buffer
UINT
*
conversion_shift
;
/* NULL if no shifted conversion */
};
const
BYTE
*
buffer_get_memory
(
IWineD3DBuffer
*
iface
,
UINT
offset
,
GLuint
*
buffer_object
)
DECLSPEC_HIDDEN
;
const
BYTE
*
buffer_get_memory
(
IWineD3DBuffer
*
iface
,
GLuint
*
buffer_object
)
DECLSPEC_HIDDEN
;
BYTE
*
buffer_get_sysmem
(
struct
wined3d_buffer
*
This
)
DECLSPEC_HIDDEN
;
HRESULT
buffer_init
(
struct
wined3d_buffer
*
buffer
,
IWineD3DDeviceImpl
*
device
,
UINT
size
,
DWORD
usage
,
WINED3DFORMAT
format
,
WINED3DPOOL
pool
,
GLenum
bind_hint
,
...
...
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