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
00550613
Commit
00550613
authored
Dec 01, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 02, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove a redundant parameter to enable_extension().
parent
f92a0667
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
13 deletions
+15
-13
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+2
-1
ati_fragment_shader.c
dlls/wined3d/ati_fragment_shader.c
+2
-1
context.c
dlls/wined3d/context.c
+5
-6
nvidia_texture_shader.c
dlls/wined3d/nvidia_texture_shader.c
+3
-2
state.c
dlls/wined3d/state.c
+2
-2
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/arb_program_shader.c
View file @
00550613
...
...
@@ -5447,7 +5447,8 @@ struct arbfp_ffp_desc
};
/* Context activation is done by the caller. */
static
void
arbfp_enable
(
IWineD3DDevice
*
iface
,
BOOL
enable
)
{
static
void
arbfp_enable
(
BOOL
enable
)
{
ENTER_GL
();
if
(
enable
)
{
glEnable
(
GL_FRAGMENT_PROGRAM_ARB
);
...
...
dlls/wined3d/ati_fragment_shader.c
View file @
00550613
...
...
@@ -1054,7 +1054,8 @@ static const struct StateEntryTemplate atifs_fragmentstate_template[] = {
};
/* Context activation is done by the caller. */
static
void
atifs_enable
(
IWineD3DDevice
*
iface
,
BOOL
enable
)
{
static
void
atifs_enable
(
BOOL
enable
)
{
ENTER_GL
();
if
(
enable
)
{
glEnable
(
GL_FRAGMENT_SHADER_ATI
);
...
...
dlls/wined3d/context.c
View file @
00550613
...
...
@@ -1572,7 +1572,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain,
LEAVE_GL
();
device
->
frag_pipe
->
enable_extension
(
(
IWineD3DDevice
*
)
device
,
TRUE
);
device
->
frag_pipe
->
enable_extension
(
TRUE
);
TRACE
(
"Created context %p.
\n
"
,
ret
);
...
...
@@ -1840,8 +1840,7 @@ static void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context *conte
Context_MarkStateDirty
(
context
,
STATE_VIEWPORT
,
StateTable
);
Context_MarkStateDirty
(
context
,
STATE_TRANSFORM
(
WINED3DTS_PROJECTION
),
StateTable
);
This
->
frag_pipe
->
enable_extension
((
IWineD3DDevice
*
)
This
,
FALSE
);
This
->
frag_pipe
->
enable_extension
(
FALSE
);
}
/*****************************************************************************
...
...
@@ -2130,7 +2129,7 @@ void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceIm
if
(
context
->
last_was_blit
)
{
device
->
frag_pipe
->
enable_extension
(
(
IWineD3DDevice
*
)
device
,
TRUE
);
device
->
frag_pipe
->
enable_extension
(
TRUE
);
}
/* Blending and clearing should be orthogonal, but tests on the nvidia
...
...
@@ -2189,7 +2188,7 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp
if
(
context
->
last_was_blit
)
{
device
->
frag_pipe
->
enable_extension
(
(
IWineD3DDevice
*
)
device
,
TRUE
);
device
->
frag_pipe
->
enable_extension
(
TRUE
);
}
ENTER_GL
();
...
...
@@ -2287,7 +2286,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurf
if
(
context
!=
current_context
)
{
if
(
!
context_set_current
(
context
))
ERR
(
"Failed to activate the new context.
\n
"
);
else
device
->
frag_pipe
->
enable_extension
(
(
IWineD3DDevice
*
)
device
,
!
context
->
last_was_blit
);
else
device
->
frag_pipe
->
enable_extension
(
!
context
->
last_was_blit
);
if
(
context
->
vshader_const_dirty
)
{
...
...
dlls/wined3d/nvidia_texture_shader.c
View file @
00550613
...
...
@@ -621,10 +621,11 @@ static void nvrc_texfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, stru
}
/* Context activation is done by the caller. */
static
void
nvrc_enable
(
IWineD3DDevice
*
iface
,
BOOL
enable
)
{
}
static
void
nvrc_enable
(
BOOL
enable
)
{
}
/* Context activation is done by the caller. */
static
void
nvts_enable
(
IWineD3DDevice
*
iface
,
BOOL
enable
)
{
static
void
nvts_enable
(
BOOL
enable
)
{
ENTER_GL
();
if
(
enable
)
{
glEnable
(
GL_TEXTURE_SHADER_NV
);
...
...
dlls/wined3d/state.c
View file @
00550613
...
...
@@ -8,7 +8,7 @@
* Copyright 2005 Oliver Stieber
* Copyright 2006 Henri Verbeet
* Copyright 2006-2008 Stefan Dösinger for CodeWeavers
* Copyright 2009 Henri Verbeet for CodeWeavers
* Copyright 2009
-2010
Henri Verbeet for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
...
...
@@ -5654,7 +5654,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = {
};
/* Context activation is done by the caller. */
static
void
ffp_enable
(
IWineD3DDevice
*
iface
,
BOOL
enable
)
{
}
static
void
ffp_enable
(
BOOL
enable
)
{
}
static
void
ffp_fragment_get_caps
(
const
struct
wined3d_gl_info
*
gl_info
,
struct
fragment_caps
*
pCaps
)
{
...
...
dlls/wined3d/wined3d_private.h
View file @
00550613
...
...
@@ -1143,7 +1143,7 @@ struct fragment_caps
struct
fragment_pipeline
{
void
(
*
enable_extension
)(
IWineD3DDevice
*
iface
,
BOOL
enable
);
void
(
*
enable_extension
)(
BOOL
enable
);
void
(
*
get_caps
)(
const
struct
wined3d_gl_info
*
gl_info
,
struct
fragment_caps
*
caps
);
HRESULT
(
*
alloc_private
)(
IWineD3DDevice
*
iface
);
void
(
*
free_private
)(
IWineD3DDevice
*
iface
);
...
...
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