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
49b55f67
Commit
49b55f67
authored
Nov 25, 2008
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 25, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Don't call IWineD3DSurfaceImpl_GetData() from surface_gdi.c.
parent
b4f0b5bd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
14 deletions
+17
-14
surface.c
dlls/wined3d/surface.c
+1
-11
surface_base.c
dlls/wined3d/surface_base.c
+14
-0
surface_gdi.c
dlls/wined3d/surface_gdi.c
+1
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-2
No files found.
dlls/wined3d/surface.c
View file @
49b55f67
...
@@ -680,16 +680,6 @@ void WINAPI IWineD3DSurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor *
...
@@ -680,16 +680,6 @@ void WINAPI IWineD3DSurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor *
*
glDescription
=
&
This
->
glDescription
;
*
glDescription
=
&
This
->
glDescription
;
}
}
/* TODO: think about moving this down to resource? */
const
void
*
WINAPI
IWineD3DSurfaceImpl_GetData
(
IWineD3DSurface
*
iface
)
{
IWineD3DSurfaceImpl
*
This
=
(
IWineD3DSurfaceImpl
*
)
iface
;
/* This should only be called for sysmem textures, it may be a good idea to extend this to all pools at some point in the future */
if
(
This
->
resource
.
pool
!=
WINED3DPOOL_SYSTEMMEM
)
{
FIXME
(
" (%p)Attempting to get system memory for a non-system memory texture
\n
"
,
iface
);
}
return
(
CONST
void
*
)(
This
->
resource
.
allocatedMemory
);
}
/* Read the framebuffer back into the surface */
/* Read the framebuffer back into the surface */
static
void
read_from_framebuffer
(
IWineD3DSurfaceImpl
*
This
,
CONST
RECT
*
rect
,
void
*
dest
,
UINT
pitch
)
{
static
void
read_from_framebuffer
(
IWineD3DSurfaceImpl
*
This
,
CONST
RECT
*
rect
,
void
*
dest
,
UINT
pitch
)
{
IWineD3DSwapChainImpl
*
swapchain
;
IWineD3DSwapChainImpl
*
swapchain
;
...
@@ -4801,7 +4791,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl =
...
@@ -4801,7 +4791,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl =
IWineD3DSurfaceImpl_SaveSnapshot
,
IWineD3DSurfaceImpl_SaveSnapshot
,
IWineD3DSurfaceImpl_SetContainer
,
IWineD3DSurfaceImpl_SetContainer
,
IWineD3DSurfaceImpl_GetGlDesc
,
IWineD3DSurfaceImpl_GetGlDesc
,
IWineD3DSurfaceImpl_GetData
,
IWineD3D
Base
SurfaceImpl_GetData
,
IWineD3DSurfaceImpl_SetFormat
,
IWineD3DSurfaceImpl_SetFormat
,
IWineD3DSurfaceImpl_PrivateSetup
,
IWineD3DSurfaceImpl_PrivateSetup
,
IWineD3DSurfaceImpl_ModifyLocation
,
IWineD3DSurfaceImpl_ModifyLocation
,
...
...
dlls/wined3d/surface_base.c
View file @
49b55f67
...
@@ -1818,3 +1818,17 @@ void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface) {
...
@@ -1818,3 +1818,17 @@ void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface) {
ERR
(
"Should not be called on base texture
\n
"
);
ERR
(
"Should not be called on base texture
\n
"
);
return
;
return
;
}
}
/* TODO: think about moving this down to resource? */
const
void
*
WINAPI
IWineD3DBaseSurfaceImpl_GetData
(
IWineD3DSurface
*
iface
)
{
IWineD3DSurfaceImpl
*
This
=
(
IWineD3DSurfaceImpl
*
)
iface
;
/* This should only be called for sysmem textures, it may be a good idea
* to extend this to all pools at some point in the future */
if
(
This
->
resource
.
pool
!=
WINED3DPOOL_SYSTEMMEM
)
{
FIXME
(
"(%p) Attempting to get system memory for a non-system memory texture
\n
"
,
iface
);
}
return
This
->
resource
.
allocatedMemory
;
}
dlls/wined3d/surface_gdi.c
View file @
49b55f67
...
@@ -679,7 +679,7 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl =
...
@@ -679,7 +679,7 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl =
IWineGDISurfaceImpl_SaveSnapshot
,
IWineGDISurfaceImpl_SaveSnapshot
,
IWineD3DBaseSurfaceImpl_SetContainer
,
IWineD3DBaseSurfaceImpl_SetContainer
,
IWineGDISurfaceImpl_GetGlDesc
,
IWineGDISurfaceImpl_GetGlDesc
,
IWineD3DSurfaceImpl_GetData
,
IWineD3D
Base
SurfaceImpl_GetData
,
IWineD3DBaseSurfaceImpl_SetFormat
,
IWineD3DBaseSurfaceImpl_SetFormat
,
IWineGDISurfaceImpl_PrivateSetup
,
IWineGDISurfaceImpl_PrivateSetup
,
IWineGDISurfaceImpl_ModifyLocation
,
IWineGDISurfaceImpl_ModifyLocation
,
...
...
dlls/wined3d/wined3d_private.h
View file @
49b55f67
...
@@ -1490,8 +1490,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst
...
@@ -1490,8 +1490,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst
IWineD3DSurface
*
Source
,
const
RECT
*
rsrc
,
DWORD
trans
);
IWineD3DSurface
*
Source
,
const
RECT
*
rsrc
,
DWORD
trans
);
HRESULT
WINAPI
IWineD3DBaseSurfaceImpl_LockRect
(
IWineD3DSurface
*
iface
,
WINED3DLOCKED_RECT
*
pLockedRect
,
CONST
RECT
*
pRect
,
DWORD
Flags
);
HRESULT
WINAPI
IWineD3DBaseSurfaceImpl_LockRect
(
IWineD3DSurface
*
iface
,
WINED3DLOCKED_RECT
*
pLockedRect
,
CONST
RECT
*
pRect
,
DWORD
Flags
);
void
WINAPI
IWineD3DBaseSurfaceImpl_BindTexture
(
IWineD3DSurface
*
iface
);
void
WINAPI
IWineD3DBaseSurfaceImpl_BindTexture
(
IWineD3DSurface
*
iface
);
const
void
*
WINAPI
IWineD3DBaseSurfaceImpl_GetData
(
IWineD3DSurface
*
iface
);
const
void
*
WINAPI
IWineD3DSurfaceImpl_GetData
(
IWineD3DSurface
*
iface
);
void
get_drawable_size_swapchain
(
IWineD3DSurfaceImpl
*
This
,
UINT
*
width
,
UINT
*
height
);
void
get_drawable_size_swapchain
(
IWineD3DSurfaceImpl
*
This
,
UINT
*
width
,
UINT
*
height
);
void
get_drawable_size_backbuffer
(
IWineD3DSurfaceImpl
*
This
,
UINT
*
width
,
UINT
*
height
);
void
get_drawable_size_backbuffer
(
IWineD3DSurfaceImpl
*
This
,
UINT
*
width
,
UINT
*
height
);
...
...
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