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
0ce17ea2
Commit
0ce17ea2
authored
Apr 04, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 05, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Don't bother setting a depth render buffer for WINED3DFMT_NULL render targets.
parent
16d57370
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
context.c
dlls/wined3d/context.c
+1
-4
surface.c
dlls/wined3d/surface.c
+13
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-2
No files found.
dlls/wined3d/context.c
View file @
0ce17ea2
...
@@ -455,10 +455,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ
...
@@ -455,10 +455,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ
/* Apply depth targets */
/* Apply depth targets */
if
(
entry
->
depth_stencil
)
if
(
entry
->
depth_stencil
)
{
surface_set_compatible_renderbuffer
(
entry
->
depth_stencil
,
entry
->
render_targets
[
0
]);
surface_set_compatible_renderbuffer
(
entry
->
depth_stencil
,
entry
->
render_targets
[
0
]
->
pow2Width
,
entry
->
render_targets
[
0
]
->
pow2Height
);
}
context_attach_depth_stencil_fbo
(
context
,
target
,
entry
->
depth_stencil
,
TRUE
);
context_attach_depth_stencil_fbo
(
context
,
target
,
entry
->
depth_stencil
,
TRUE
);
entry
->
attached
=
TRUE
;
entry
->
attached
=
TRUE
;
...
...
dlls/wined3d/surface.c
View file @
0ce17ea2
...
@@ -1104,12 +1104,24 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct win
...
@@ -1104,12 +1104,24 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct win
* render target dimensions. With FBOs, the dimensions have to be an exact match. */
* render target dimensions. With FBOs, the dimensions have to be an exact match. */
/* TODO: We should synchronize the renderbuffer's content with the texture's content. */
/* TODO: We should synchronize the renderbuffer's content with the texture's content. */
/* GL locking is done by the caller */
/* GL locking is done by the caller */
void
surface_set_compatible_renderbuffer
(
IWineD3DSurfaceImpl
*
surface
,
unsigned
int
width
,
unsigned
int
heigh
t
)
void
surface_set_compatible_renderbuffer
(
IWineD3DSurfaceImpl
*
surface
,
IWineD3DSurfaceImpl
*
r
t
)
{
{
const
struct
wined3d_gl_info
*
gl_info
=
&
surface
->
resource
.
device
->
adapter
->
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
=
&
surface
->
resource
.
device
->
adapter
->
gl_info
;
renderbuffer_entry_t
*
entry
;
renderbuffer_entry_t
*
entry
;
GLuint
renderbuffer
=
0
;
GLuint
renderbuffer
=
0
;
unsigned
int
src_width
,
src_height
;
unsigned
int
src_width
,
src_height
;
unsigned
int
width
,
height
;
if
(
rt
->
resource
.
format
->
id
!=
WINED3DFMT_NULL
)
{
width
=
rt
->
pow2Width
;
height
=
rt
->
pow2Height
;
}
else
{
width
=
surface
->
pow2Width
;
height
=
surface
->
pow2Height
;
}
src_width
=
surface
->
pow2Width
;
src_width
=
surface
->
pow2Width
;
src_height
=
surface
->
pow2Height
;
src_height
=
surface
->
pow2Height
;
...
...
dlls/wined3d/wined3d_private.h
View file @
0ce17ea2
...
@@ -2121,8 +2121,7 @@ void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location, UI
...
@@ -2121,8 +2121,7 @@ void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location, UI
void
surface_modify_location
(
IWineD3DSurfaceImpl
*
surface
,
DWORD
flag
,
BOOL
persistent
)
DECLSPEC_HIDDEN
;
void
surface_modify_location
(
IWineD3DSurfaceImpl
*
surface
,
DWORD
flag
,
BOOL
persistent
)
DECLSPEC_HIDDEN
;
void
surface_prepare_texture
(
IWineD3DSurfaceImpl
*
surface
,
void
surface_prepare_texture
(
IWineD3DSurfaceImpl
*
surface
,
const
struct
wined3d_gl_info
*
gl_info
,
BOOL
srgb
)
DECLSPEC_HIDDEN
;
const
struct
wined3d_gl_info
*
gl_info
,
BOOL
srgb
)
DECLSPEC_HIDDEN
;
void
surface_set_compatible_renderbuffer
(
IWineD3DSurfaceImpl
*
surface
,
void
surface_set_compatible_renderbuffer
(
IWineD3DSurfaceImpl
*
surface
,
IWineD3DSurfaceImpl
*
rt
)
DECLSPEC_HIDDEN
;
unsigned
int
width
,
unsigned
int
height
)
DECLSPEC_HIDDEN
;
void
surface_set_container
(
IWineD3DSurfaceImpl
*
surface
,
void
surface_set_container
(
IWineD3DSurfaceImpl
*
surface
,
enum
wined3d_container_type
type
,
void
*
container
)
DECLSPEC_HIDDEN
;
enum
wined3d_container_type
type
,
void
*
container
)
DECLSPEC_HIDDEN
;
void
surface_set_texture_name
(
IWineD3DSurfaceImpl
*
surface
,
GLuint
name
,
BOOL
srgb_name
)
DECLSPEC_HIDDEN
;
void
surface_set_texture_name
(
IWineD3DSurfaceImpl
*
surface
,
GLuint
name
,
BOOL
srgb_name
)
DECLSPEC_HIDDEN
;
...
...
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