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
0caed0a7
Commit
0caed0a7
authored
Dec 09, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 10, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Explicitly pass blit_priv and gl_info to gen_p8_shader().
parent
fa755171
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+3
-4
No files found.
dlls/wined3d/arb_program_shader.c
View file @
0caed0a7
...
@@ -6771,12 +6771,11 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, GLenum textype,
...
@@ -6771,12 +6771,11 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, GLenum textype,
return
TRUE
;
return
TRUE
;
}
}
static
GLuint
gen_p8_shader
(
IWineD3DDeviceImpl
*
device
,
GLenum
textype
)
static
GLuint
gen_p8_shader
(
struct
arbfp_blit_priv
*
priv
,
const
struct
wined3d_gl_info
*
gl_info
,
GLenum
textype
)
{
{
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
GLenum
shader
;
GLenum
shader
;
struct
wined3d_shader_buffer
buffer
;
struct
wined3d_shader_buffer
buffer
;
struct
arbfp_blit_priv
*
priv
=
device
->
blit_priv
;
GLint
pos
;
GLint
pos
;
/* Shader header */
/* Shader header */
...
@@ -7068,7 +7067,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac
...
@@ -7068,7 +7067,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac
case
COMPLEX_FIXUP_P8
:
case
COMPLEX_FIXUP_P8
:
shader
=
textype
==
GL_TEXTURE_RECTANGLE_ARB
?
priv
->
p8_rect_shader
:
priv
->
p8_2d_shader
;
shader
=
textype
==
GL_TEXTURE_RECTANGLE_ARB
?
priv
->
p8_rect_shader
:
priv
->
p8_2d_shader
;
if
(
!
shader
)
shader
=
gen_p8_shader
(
device
,
textype
);
if
(
!
shader
)
shader
=
gen_p8_shader
(
priv
,
gl_info
,
textype
);
upload_palette
(
surface
);
upload_palette
(
surface
);
break
;
break
;
...
...
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