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
d523dee7
Commit
d523dee7
authored
Mar 02, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Mar 02, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Retrieve the surface's texture name through a function.
parent
ddc7a803
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
context.c
dlls/wined3d/context.c
+6
-8
wined3d_private.h
dlls/wined3d/wined3d_private.h
+5
-0
No files found.
dlls/wined3d/context.c
View file @
d523dee7
...
@@ -273,20 +273,18 @@ static void context_attach_surface_fbo(const struct wined3d_context *context,
...
@@ -273,20 +273,18 @@ static void context_attach_surface_fbo(const struct wined3d_context *context,
if
(
surface
&&
surface
->
resource
.
format
->
id
!=
WINED3DFMT_NULL
)
if
(
surface
&&
surface
->
resource
.
format
->
id
!=
WINED3DFMT_NULL
)
{
{
BOOL
srgb
;
switch
(
location
)
switch
(
location
)
{
{
case
SFLAG_INTEXTURE
:
case
SFLAG_INTEXTURE
:
surface_prepare_texture
(
surface
,
gl_info
,
FALSE
);
context_apply_attachment_filter_states
(
surface
,
location
);
gl_info
->
fbo_ops
.
glFramebufferTexture2D
(
fbo_target
,
GL_COLOR_ATTACHMENT0
+
idx
,
surface
->
texture_target
,
surface
->
texture_name
,
surface
->
texture_level
);
break
;
case
SFLAG_INSRGBTEX
:
case
SFLAG_INSRGBTEX
:
surface_prepare_texture
(
surface
,
gl_info
,
TRUE
);
srgb
=
location
==
SFLAG_INSRGBTEX
;
surface_prepare_texture
(
surface
,
gl_info
,
srgb
);
context_apply_attachment_filter_states
(
surface
,
location
);
context_apply_attachment_filter_states
(
surface
,
location
);
gl_info
->
fbo_ops
.
glFramebufferTexture2D
(
fbo_target
,
GL_COLOR_ATTACHMENT0
+
idx
,
gl_info
->
fbo_ops
.
glFramebufferTexture2D
(
fbo_target
,
GL_COLOR_ATTACHMENT0
+
idx
,
surface
->
texture_target
,
surface
->
texture_name_srgb
,
surface
->
texture_level
);
surface
->
texture_target
,
surface_get_texture_name
(
surface
,
srgb
),
surface
->
texture_level
);
break
;
break
;
default:
default:
...
...
dlls/wined3d/wined3d_private.h
View file @
d523dee7
...
@@ -2155,6 +2155,11 @@ static inline IWineD3DSurfaceImpl *surface_from_resource(struct wined3d_resource
...
@@ -2155,6 +2155,11 @@ static inline IWineD3DSurfaceImpl *surface_from_resource(struct wined3d_resource
return
CONTAINING_RECORD
(
resource
,
IWineD3DSurfaceImpl
,
resource
);
return
CONTAINING_RECORD
(
resource
,
IWineD3DSurfaceImpl
,
resource
);
}
}
static
inline
GLuint
surface_get_texture_name
(
IWineD3DSurfaceImpl
*
surface
,
BOOL
srgb
)
{
return
srgb
?
surface
->
texture_name_srgb
:
surface
->
texture_name
;
}
void
surface_add_dirty_rect
(
IWineD3DSurfaceImpl
*
surface
,
const
RECT
*
dirty_rect
)
DECLSPEC_HIDDEN
;
void
surface_add_dirty_rect
(
IWineD3DSurfaceImpl
*
surface
,
const
RECT
*
dirty_rect
)
DECLSPEC_HIDDEN
;
void
surface_bind
(
IWineD3DSurfaceImpl
*
surface
,
BOOL
srgb
)
DECLSPEC_HIDDEN
;
void
surface_bind
(
IWineD3DSurfaceImpl
*
surface
,
BOOL
srgb
)
DECLSPEC_HIDDEN
;
HRESULT
surface_color_fill
(
IWineD3DSurfaceImpl
*
s
,
const
RECT
*
rect
,
const
WINED3DCOLORVALUE
*
color
)
DECLSPEC_HIDDEN
;
HRESULT
surface_color_fill
(
IWineD3DSurfaceImpl
*
s
,
const
RECT
*
rect
,
const
WINED3DCOLORVALUE
*
color
)
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