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
a22933e0
Commit
a22933e0
authored
Dec 28, 2006
by
H. Verbeet
Committed by
Alexandre Julliard
Dec 28, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: The default debug channel for arb_program_shader.c & glsl_shader.c already is d3d_shader.
parent
c9723510
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+2
-2
glsl_shader.c
dlls/wined3d/glsl_shader.c
+1
-1
No files found.
dlls/wined3d/arb_program_shader.c
View file @
a22933e0
...
...
@@ -996,7 +996,7 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {
/* Enable OpenGL vertex programs */
glEnable
(
GL_VERTEX_PROGRAM_ARB
);
checkGLcall
(
"glEnable(GL_VERTEX_PROGRAM_ARB);"
);
TRACE
_
(
d3d_shader
)
(
"(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB
\n
"
,
TRACE
(
"(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB
\n
"
,
This
,
((
IWineD3DVertexShaderImpl
*
)
This
->
stateBlock
->
vertexShader
)
->
baseShader
.
prgId
);
}
...
...
@@ -1011,7 +1011,7 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {
/* Enable OpenGL fragment programs */
glEnable
(
GL_FRAGMENT_PROGRAM_ARB
);
checkGLcall
(
"glEnable(GL_FRAGMENT_PROGRAM_ARB);"
);
TRACE
_
(
d3d_shader
)
(
"(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB
\n
"
,
TRACE
(
"(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB
\n
"
,
This
,
((
IWineD3DPixelShaderImpl
*
)
This
->
stateBlock
->
pixelShader
)
->
baseShader
.
prgId
);
}
}
...
...
dlls/wined3d/glsl_shader.c
View file @
a22933e0
...
...
@@ -66,7 +66,7 @@ void shader_glsl_load_psamplers(
snprintf
(
sampler_name
,
sizeof
(
sampler_name
),
"Psampler%d"
,
i
);
name_loc
=
GL_EXTCALL
(
glGetUniformLocationARB
(
programId
,
sampler_name
));
if
(
name_loc
!=
-
1
)
{
TRACE
_
(
d3d_shader
)
(
"Loading %s for texture %d
\n
"
,
sampler_name
,
i
);
TRACE
(
"Loading %s for texture %d
\n
"
,
sampler_name
,
i
);
GL_EXTCALL
(
glUniform1iARB
(
name_loc
,
i
));
checkGLcall
(
"glUniform1iARB"
);
}
...
...
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