Józef Kucia : wined3d: Use GLuint instead of GLenum to store ARB blitter shaders.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 966a07149a029191d3d9ba010e5bcb8ccb8114a4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=966a07149a029191d3d9ba010e...

Author: Józef Kucia 
Date:   Thu Mar 17 11:47:15 2016 +0100

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

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/arb_program_shader.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 189a516..99c21db 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -6939,7 +6939,7 @@ struct arbfp_blit_type

struct arbfp_blit_desc
 {
-    GLenum shader;
+    GLuint shader;
     struct arbfp_blit_type type;
     struct wine_rb_entry entry;
 };
@@ -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,
         const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type)
 {
-    GLenum shader;
+    GLuint shader;
     struct wined3d_string_buffer buffer;
     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
 static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info,
         const struct arbfp_blit_type *type)
 {
-    GLenum shader;
+    GLuint shader;
     struct wined3d_string_buffer buffer;
     char luminance_component;

@@ -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,
         const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type)
 {
-    GLenum shader;
+    GLuint shader;
     struct wined3d_string_buffer buffer;
     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,
 static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface,
         const struct wined3d_color_key *color_key)
 {
-    GLenum shader;
+    GLuint shader;
     float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f};
     const struct wined3d_texture *texture = surface->container;
     struct arbfp_blit_priv *priv = blit_priv;