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
d5d45684
Commit
d5d45684
authored
Jun 09, 2006
by
Jason Green
Committed by
Alexandre Julliard
Jun 09, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Allow drawPrim to create and use the GLSL program.
parent
b67cda24
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
drawprim.c
dlls/wined3d/drawprim.c
+14
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+3
-0
No files found.
dlls/wined3d/drawprim.c
View file @
d5d45684
...
...
@@ -1920,7 +1920,20 @@ UINT numberOfvertices, UINT numberOfIndicies, GLenum glPrimType, const void *idx
TRACE
(
"Loaded arrays
\n
"
);
/* TODO: Bind the correct GLSL shader program here. */
/* Bind the correct GLSL shader program based on the currently set vertex & pixel shaders. */
if
(
wined3d_settings
.
shader_mode
==
SHADER_GLSL
)
{
GLhandleARB
programId
;
set_glsl_shader_program
(
iface
);
programId
=
This
->
stateBlock
->
shaderPrgId
;
if
(
programId
!=
0
)
{
/* Start using this program ID */
TRACE_
(
d3d_shader
)(
"Using GLSL program %u
\n
"
,
programId
);
GL_EXTCALL
(
glUseProgramObjectARB
(
programId
));
checkGLcall
(
"glUseProgramObjectARB"
);
}
}
if
(
useVertexShaderFunction
)
{
...
...
dlls/wined3d/wined3d_private.h
View file @
d5d45684
...
...
@@ -1317,6 +1317,9 @@ extern const SHADER_OPCODE* shader_get_opcode(
/* ARB shader program Prototypes */
extern
void
shader_hw_def
(
SHADER_OPCODE_ARG
*
arg
);
/* GLSL helper programs */
extern
void
set_glsl_shader_program
(
IWineD3DDevice
*
iface
);
/** The following translate DirectX pixel/vertex shader opcodes to GLSL lines */
extern
void
shader_glsl_map2gl
(
SHADER_OPCODE_ARG
*
arg
);
extern
void
shader_glsl_arith
(
SHADER_OPCODE_ARG
*
arg
);
...
...
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