Commit 966a0714 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

wined3d: Use GLuint instead of GLenum to store ARB blitter shaders.

parent 4b926f91
...@@ -6939,7 +6939,7 @@ struct arbfp_blit_type ...@@ -6939,7 +6939,7 @@ struct arbfp_blit_type
struct arbfp_blit_desc struct arbfp_blit_desc
{ {
GLenum shader; GLuint shader;
struct arbfp_blit_type type; struct arbfp_blit_type type;
struct wine_rb_entry entry; struct wine_rb_entry entry;
}; };
...@@ -7393,7 +7393,7 @@ static BOOL gen_nv12_read(struct wined3d_string_buffer *buffer, const struct arb ...@@ -7393,7 +7393,7 @@ static BOOL gen_nv12_read(struct wined3d_string_buffer *buffer, const struct arb
static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, static GLuint gen_p8_shader(struct arbfp_blit_priv *priv,
const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type)
{ {
GLenum shader; GLuint shader;
struct wined3d_string_buffer buffer; struct wined3d_string_buffer buffer;
const char *tex_target = arbfp_texture_target(type->res_type); const char *tex_target = arbfp_texture_target(type->res_type);
...@@ -7482,7 +7482,7 @@ static void upload_palette(const struct wined3d_texture *texture, struct wined3d ...@@ -7482,7 +7482,7 @@ static void upload_palette(const struct wined3d_texture *texture, struct wined3d
static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info,
const struct arbfp_blit_type *type) const struct arbfp_blit_type *type)
{ {
GLenum shader; GLuint shader;
struct wined3d_string_buffer buffer; struct wined3d_string_buffer buffer;
char luminance_component; char luminance_component;
...@@ -7607,7 +7607,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ ...@@ -7607,7 +7607,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_
static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv,
const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type)
{ {
GLenum shader; GLuint shader;
struct wined3d_string_buffer buffer; struct wined3d_string_buffer buffer;
const char *tex_target = arbfp_texture_target(type->res_type); const char *tex_target = arbfp_texture_target(type->res_type);
...@@ -7661,7 +7661,7 @@ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, ...@@ -7661,7 +7661,7 @@ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv,
static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface,
const struct wined3d_color_key *color_key) const struct wined3d_color_key *color_key)
{ {
GLenum shader; GLuint shader;
float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f};
const struct wined3d_texture *texture = surface->container; const struct wined3d_texture *texture = surface->container;
struct arbfp_blit_priv *priv = blit_priv; struct arbfp_blit_priv *priv = blit_priv;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment