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
af1ba676
Commit
af1ba676
authored
Jul 24, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 25, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a gl_info structure to fragment_pipeline.enable_extension().
parent
4b90d794
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
14 deletions
+13
-14
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+1
-1
ati_fragment_shader.c
dlls/wined3d/ati_fragment_shader.c
+1
-1
context.c
dlls/wined3d/context.c
+6
-7
nvidia_texture_shader.c
dlls/wined3d/nvidia_texture_shader.c
+3
-3
state.c
dlls/wined3d/state.c
+1
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/arb_program_shader.c
View file @
af1ba676
...
...
@@ -5585,7 +5585,7 @@ struct arbfp_ffp_desc
};
/* Context activation and GL locking are done by the caller. */
static
void
arbfp_enable
(
BOOL
enable
)
static
void
arbfp_enable
(
const
struct
wined3d_gl_info
*
gl_info
,
BOOL
enable
)
{
if
(
enable
)
{
glEnable
(
GL_FRAGMENT_PROGRAM_ARB
);
...
...
dlls/wined3d/ati_fragment_shader.c
View file @
af1ba676
...
...
@@ -1093,7 +1093,7 @@ static const struct StateEntryTemplate atifs_fragmentstate_template[] = {
};
/* Context activation and GL locking are done by the caller. */
static
void
atifs_enable
(
BOOL
enable
)
static
void
atifs_enable
(
const
struct
wined3d_gl_info
*
gl_info
,
BOOL
enable
)
{
if
(
enable
)
{
glEnable
(
GL_FRAGMENT_SHADER_ATI
);
...
...
dlls/wined3d/context.c
View file @
af1ba676
...
...
@@ -1569,7 +1569,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain,
{
GL_EXTCALL
(
glProvokingVertexEXT
(
GL_FIRST_VERTEX_CONVENTION_EXT
));
}
device
->
frag_pipe
->
enable_extension
(
TRUE
);
device
->
frag_pipe
->
enable_extension
(
gl_info
,
TRUE
);
/* If this happens to be the first context for the device, dummy textures
* are not created yet. In that case, they will be created (and bound) by
...
...
@@ -1866,7 +1866,7 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con
context_invalidate_state
(
context
,
STATE_RENDER
(
WINED3D_RS_CLIPPING
));
set_blit_dimension
(
rt_size
.
cx
,
rt_size
.
cy
);
device
->
frag_pipe
->
enable_extension
(
FALSE
);
device
->
frag_pipe
->
enable_extension
(
gl_info
,
FALSE
);
LEAVE_GL
();
...
...
@@ -2139,6 +2139,7 @@ static BOOL context_validate_rt_config(UINT rt_count,
BOOL
context_apply_clear_state
(
struct
wined3d_context
*
context
,
const
struct
wined3d_device
*
device
,
UINT
rt_count
,
const
struct
wined3d_fb_state
*
fb
)
{
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
DWORD
rt_mask
=
0
,
*
cur_mask
;
UINT
i
;
struct
wined3d_surface
**
rts
=
fb
->
render_targets
;
...
...
@@ -2221,7 +2222,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win
if
(
context
->
last_was_blit
)
{
device
->
frag_pipe
->
enable_extension
(
TRUE
);
device
->
frag_pipe
->
enable_extension
(
gl_info
,
TRUE
);
context
->
last_was_blit
=
FALSE
;
}
...
...
@@ -2349,9 +2350,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de
ENTER_GL
();
if
(
context
->
last_was_blit
)
{
device
->
frag_pipe
->
enable_extension
(
TRUE
);
}
device
->
frag_pipe
->
enable_extension
(
context
->
gl_info
,
TRUE
);
for
(
i
=
0
;
i
<
context
->
numDirtyEntries
;
++
i
)
{
...
...
@@ -2491,7 +2490,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str
else
{
ENTER_GL
();
device
->
frag_pipe
->
enable_extension
(
!
context
->
last_was_blit
);
device
->
frag_pipe
->
enable_extension
(
context
->
gl_info
,
!
context
->
last_was_blit
);
LEAVE_GL
();
}
}
...
...
dlls/wined3d/nvidia_texture_shader.c
View file @
af1ba676
...
...
@@ -630,7 +630,7 @@ static void nvrc_texfactor(struct wined3d_context *context, const struct wined3d
}
/* Context activation is done by the caller. */
static
void
nvrc_enable
(
BOOL
enable
)
static
void
nvrc_enable
(
const
struct
wined3d_gl_info
*
gl_info
,
BOOL
enable
)
{
if
(
enable
)
{
...
...
@@ -645,9 +645,9 @@ static void nvrc_enable(BOOL enable)
}
/* Context activation and GL locking are done by the caller. */
static
void
nvts_enable
(
BOOL
enable
)
static
void
nvts_enable
(
const
struct
wined3d_gl_info
*
gl_info
,
BOOL
enable
)
{
nvrc_enable
(
enable
);
nvrc_enable
(
gl_info
,
enable
);
if
(
enable
)
{
glEnable
(
GL_TEXTURE_SHADER_NV
);
...
...
dlls/wined3d/state.c
View file @
af1ba676
...
...
@@ -5571,7 +5571,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = {
};
/* Context activation and GL locking are done by the caller. */
static
void
ffp_enable
(
BOOL
enable
)
{}
static
void
ffp_enable
(
const
struct
wined3d_gl_info
*
gl_info
,
BOOL
enable
)
{}
static
void
ffp_fragment_get_caps
(
const
struct
wined3d_gl_info
*
gl_info
,
struct
fragment_caps
*
caps
)
{
...
...
dlls/wined3d/wined3d_private.h
View file @
af1ba676
...
...
@@ -1166,7 +1166,7 @@ struct fragment_caps
struct
fragment_pipeline
{
void
(
*
enable_extension
)(
BOOL
enable
);
void
(
*
enable_extension
)(
const
struct
wined3d_gl_info
*
gl_info
,
BOOL
enable
);
void
(
*
get_caps
)(
const
struct
wined3d_gl_info
*
gl_info
,
struct
fragment_caps
*
caps
);
HRESULT
(
*
alloc_private
)(
struct
wined3d_device
*
device
);
void
(
*
free_private
)(
struct
wined3d_device
*
device
);
...
...
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