Alex Henrie : wined3d: Turn char_component and color into static constants.

Alexandre Julliard julliard at wine.codeweavers.com
Sun Jan 3 14:24:15 CST 2016


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

Author: Alex Henrie <alexhenrie24 at gmail.com>
Date:   Wed Dec 23 21:56:57 2015 -0700

wined3d: Turn char_component and color into static constants.

Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/arb_program_shader.c | 2 +-
 dlls/wined3d/device.c             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 6851620..8a023d8 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -3218,8 +3218,8 @@ static void vshader_add_footer(struct shader_arb_ctx_priv *priv_ctx,
     }
     else if (args->clip.boolclip.clip_texcoord)
     {
+        static const char component[4] = {'x', 'y', 'z', 'w'};
         unsigned int cur_clip = 0;
-        char component[4] = {'x', 'y', 'z', 'w'};
         const char *zero = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_ZERO);
 
         for (i = 0; i < gl_info->limits.clipplanes; ++i)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 057ae18..76c4e7d 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -679,7 +679,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_
     count = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers);
     for (i = 0; i < count; ++i)
     {
-        DWORD color = 0x000000ff;
+        static const DWORD color = 0x000000ff;
 
         /* Make appropriate texture active */
         context_active_texture(context, gl_info, i);




More information about the wine-cvs mailing list