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
2d5c8aff
Commit
2d5c8aff
authored
Sep 29, 2014
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 29, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of SFLAG_DONOTFREE.
parent
97856bcf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
11 deletions
+6
-11
surface.c
dlls/wined3d/surface.c
+6
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+0
-10
No files found.
dlls/wined3d/surface.c
View file @
2d5c8aff
...
@@ -587,7 +587,12 @@ void surface_prepare_map_memory(struct wined3d_surface *surface)
...
@@ -587,7 +587,12 @@ void surface_prepare_map_memory(struct wined3d_surface *surface)
static
void
surface_evict_sysmem
(
struct
wined3d_surface
*
surface
)
static
void
surface_evict_sysmem
(
struct
wined3d_surface
*
surface
)
{
{
if
(
surface
->
resource
.
map_count
||
surface
->
flags
&
SFLAG_DONOTFREE
)
/* In some conditions the surface memory must not be freed:
* SFLAG_CONVERTED: Converting the data back would take too long
* SFLAG_DYNLOCK: Avoid freeing the data for performance
* SFLAG_CLIENT: OpenGL uses our memory as backup */
if
(
surface
->
resource
.
map_count
||
surface
->
flags
&
(
SFLAG_CONVERTED
|
SFLAG_DYNLOCK
|
SFLAG_CLIENT
|
SFLAG_PIN_SYSMEM
))
return
;
return
;
wined3d_resource_free_sysmem
(
&
surface
->
resource
);
wined3d_resource_free_sysmem
(
&
surface
->
resource
);
...
...
dlls/wined3d/wined3d_private.h
View file @
2d5c8aff
...
@@ -2350,16 +2350,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D
...
@@ -2350,16 +2350,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D
#define SFLAG_ALLOCATED 0x00000800
/* A GL texture is allocated for this surface. */
#define SFLAG_ALLOCATED 0x00000800
/* A GL texture is allocated for this surface. */
#define SFLAG_SRGBALLOCATED 0x00001000
/* A sRGB GL texture is allocated for this surface. */
#define SFLAG_SRGBALLOCATED 0x00001000
/* A sRGB GL texture is allocated for this surface. */
/* In some conditions the surface memory must not be freed:
* SFLAG_CONVERTED: Converting the data back would take too long
* SFLAG_DYNLOCK: Avoid freeing the data for performance
* SFLAG_CLIENT: OpenGL uses our memory as backup
*/
#define SFLAG_DONOTFREE (SFLAG_CONVERTED | \
SFLAG_DYNLOCK | \
SFLAG_CLIENT | \
SFLAG_PIN_SYSMEM)
enum
wined3d_conversion_type
enum
wined3d_conversion_type
{
{
WINED3D_CT_NONE
,
WINED3D_CT_NONE
,
...
...
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