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
f71e84d8
Commit
f71e84d8
authored
Jan 24, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 25, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Store a pointer to the GL info in the shader context.
parent
c78cce88
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
glsl_shader.c
dlls/wined3d/glsl_shader.c
+4
-7
shader.c
dlls/wined3d/shader.c
+1
-0
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-0
No files found.
dlls/wined3d/glsl_shader.c
View file @
f71e84d8
...
...
@@ -1194,8 +1194,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register *
static
const
char
*
const
hwrastout_reg_names
[]
=
{
"gl_Position"
,
"gl_FogFragCoord"
,
"gl_PointSize"
};
IWineD3DBaseShaderImpl
*
This
=
(
IWineD3DBaseShaderImpl
*
)
ins
->
ctx
->
shader
;
IWineD3DDeviceImpl
*
deviceImpl
=
(
IWineD3DDeviceImpl
*
)
This
->
baseShader
.
device
;
const
struct
wined3d_gl_info
*
gl_info
=
&
deviceImpl
->
adapter
->
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
=
ins
->
ctx
->
gl_info
;
char
pshader
=
shader_is_pshader_version
(
This
->
baseShader
.
reg_maps
.
shader_version
.
type
);
*
is_color
=
FALSE
;
...
...
@@ -1819,9 +1818,7 @@ static void shader_glsl_arith(const struct wined3d_shader_instruction *ins)
/* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */
static
void
shader_glsl_mov
(
const
struct
wined3d_shader_instruction
*
ins
)
{
IWineD3DBaseShaderImpl
*
shader
=
(
IWineD3DBaseShaderImpl
*
)
ins
->
ctx
->
shader
;
IWineD3DDeviceImpl
*
device
=
(
IWineD3DDeviceImpl
*
)
shader
->
baseShader
.
device
;
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
=
ins
->
ctx
->
gl_info
;
struct
wined3d_shader_buffer
*
buffer
=
ins
->
ctx
->
buffer
;
glsl_src_param_t
src0_param
;
DWORD
write_mask
;
...
...
@@ -2776,7 +2773,7 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins)
{
IWineD3DBaseShaderImpl
*
This
=
(
IWineD3DBaseShaderImpl
*
)
ins
->
ctx
->
shader
;
IWineD3DDeviceImpl
*
deviceImpl
=
(
IWineD3DDeviceImpl
*
)
This
->
baseShader
.
device
;
const
struct
wined3d_gl_info
*
gl_info
=
&
deviceImpl
->
adapter
->
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
=
ins
->
ctx
->
gl_info
;
glsl_sample_function_t
sample_function
;
glsl_src_param_t
coord_param
,
dx_param
,
dy_param
;
DWORD
sample_flags
=
WINED3D_GLSL_SAMPLE_GRAD
;
...
...
@@ -2810,7 +2807,7 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins)
{
IWineD3DBaseShaderImpl
*
This
=
(
IWineD3DBaseShaderImpl
*
)
ins
->
ctx
->
shader
;
IWineD3DDeviceImpl
*
deviceImpl
=
(
IWineD3DDeviceImpl
*
)
This
->
baseShader
.
device
;
const
struct
wined3d_gl_info
*
gl_info
=
&
deviceImpl
->
adapter
->
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
=
ins
->
ctx
->
gl_info
;
glsl_sample_function_t
sample_function
;
glsl_src_param_t
coord_param
,
lod_param
;
DWORD
sample_flags
=
WINED3D_GLSL_SAMPLE_LOD
;
...
...
dlls/wined3d/shader.c
View file @
f71e84d8
...
...
@@ -1100,6 +1100,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe
/* Initialize current parsing state. */
ctx
.
shader
=
iface
;
ctx
.
gl_info
=
&
device
->
adapter
->
gl_info
;
ctx
.
reg_maps
=
reg_maps
;
ctx
.
buffer
=
buffer
;
ctx
.
backend_data
=
backend_ctx
;
...
...
dlls/wined3d/wined3d_private.h
View file @
f71e84d8
...
...
@@ -549,6 +549,7 @@ typedef struct shader_reg_maps
struct
wined3d_shader_context
{
IWineD3DBaseShader
*
shader
;
const
struct
wined3d_gl_info
*
gl_info
;
const
struct
shader_reg_maps
*
reg_maps
;
struct
wined3d_shader_buffer
*
buffer
;
void
*
backend_data
;
...
...
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