Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
0ba5f7dd
Commit
0ba5f7dd
authored
Nov 08, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 09, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of RTL_DISABLE.
parent
b6c7a3db
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
32 deletions
+2
-32
surface.c
dlls/wined3d/surface.c
+1
-25
wined3d_main.c
dlls/wined3d/wined3d_main.c
+1
-6
wined3d_private.h
dlls/wined3d/wined3d_private.h
+0
-1
No files found.
dlls/wined3d/surface.c
View file @
0ba5f7dd
...
...
@@ -868,11 +868,7 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD
&&
rect
->
right
==
surface
->
resource
.
width
&&
rect
->
bottom
==
surface
->
resource
.
height
)
pass_rect
=
NULL
;
if
(
!
(
wined3d_settings
.
rendertargetlock_mode
==
RTL_DISABLE
&&
((
surface
->
container
.
type
==
WINED3D_CONTAINER_SWAPCHAIN
)
||
surface
==
device
->
fb
.
render_targets
[
0
])))
surface_load_location
(
surface
,
SFLAG_INSYSMEM
,
pass_rect
);
surface_load_location
(
surface
,
SFLAG_INSYSMEM
,
pass_rect
);
}
if
(
surface
->
flags
&
SFLAG_PBO
)
...
...
@@ -964,17 +960,6 @@ static void surface_unmap(struct wined3d_surface *surface)
if
(
surface
->
container
.
type
==
WINED3D_CONTAINER_SWAPCHAIN
||
(
device
->
fb
.
render_targets
&&
surface
==
device
->
fb
.
render_targets
[
0
]))
{
if
(
wined3d_settings
.
rendertargetlock_mode
==
RTL_DISABLE
)
{
static
BOOL
warned
=
FALSE
;
if
(
!
warned
)
{
ERR
(
"The application tries to write to the render target, but render target locking is disabled.
\n
"
);
warned
=
TRUE
;
}
goto
done
;
}
if
(
!
surface
->
dirtyRect
.
left
&&
!
surface
->
dirtyRect
.
top
&&
surface
->
dirtyRect
.
right
==
surface
->
resource
.
width
&&
surface
->
dirtyRect
.
bottom
==
surface
->
resource
.
height
)
...
...
@@ -4013,15 +3998,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r
GLint
skipPix
=
0
;
GLint
skipRow
=
0
;
if
(
wined3d_settings
.
rendertargetlock_mode
==
RTL_DISABLE
)
{
static
BOOL
warned
=
FALSE
;
if
(
!
warned
)
{
ERR
(
"The application tries to lock the render target, but render target locking is disabled
\n
"
);
warned
=
TRUE
;
}
return
;
}
context
=
context_acquire
(
device
,
surface
);
context_apply_blit_state
(
context
,
device
);
gl_info
=
context
->
gl_info
;
...
...
dlls/wined3d/wined3d_main.c
View file @
0ba5f7dd
...
...
@@ -260,12 +260,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
}
if
(
!
get_config_key
(
hkey
,
appkey
,
"RenderTargetLockMode"
,
buffer
,
size
)
)
{
if
(
!
strcmp
(
buffer
,
"disabled"
))
{
TRACE
(
"Disabling render target locking
\n
"
);
wined3d_settings
.
rendertargetlock_mode
=
RTL_DISABLE
;
}
else
if
(
!
strcmp
(
buffer
,
"readdraw"
))
if
(
!
strcmp
(
buffer
,
"readdraw"
))
{
TRACE
(
"Using glReadPixels for render target reading and glDrawPixels for writing
\n
"
);
wined3d_settings
.
rendertargetlock_mode
=
RTL_READDRAW
;
...
...
dlls/wined3d/wined3d_private.h
View file @
0ba5f7dd
...
...
@@ -246,7 +246,6 @@ static inline float float_24_to_32(DWORD in)
#define SHADER_ATI 3
#define SHADER_NONE 4
#define RTL_DISABLE -1
#define RTL_READDRAW 1
#define RTL_READTEX 2
...
...
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