Matteo Bruni : wined3d: Fix a bunch of typos.

Alexandre Julliard julliard at winehq.org
Fri Sep 23 10:25:16 CDT 2016


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

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Thu Sep 22 20:39:37 2016 +0200

wined3d: Fix a bunch of typos.

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/context.c | 6 +++---
 dlls/wined3d/state.c   | 2 +-
 dlls/wined3d/utils.c   | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index f5311af..b5a4589 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -551,7 +551,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context,
                 rt_texture = render_targets[i]->container;
                 TRACE("    Color attachment %u: %p format %s, %s %u, %ux%u, %u samples.\n",
                         i, render_targets[i], debug_d3dformat(rt_texture->resource.format->id),
-                        context->fbo_key->rb_namespace & (1 << (i + 1)) ? "renderbuffer" : "texure",
+                        context->fbo_key->rb_namespace & (1 << (i + 1)) ? "renderbuffer" : "texture",
                         context->fbo_key->objects[i + 1].object,
                         wined3d_texture_get_level_pow2_width(rt_texture, render_targets[i]->texture_level),
                         wined3d_texture_get_level_pow2_height(rt_texture, render_targets[i]->texture_level),
@@ -563,7 +563,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context,
             ds_texture = depth_stencil->container;
             TRACE("    Depth attachment: %p format %s, %s %u, %ux%u, %u samples.\n",
                     depth_stencil, debug_d3dformat(ds_texture->resource.format->id),
-                    context->fbo_key->rb_namespace & (1 << 0) ? "renderbuffer" : "texure",
+                    context->fbo_key->rb_namespace & (1 << 0) ? "renderbuffer" : "texture",
                     context->fbo_key->objects[0].object,
                     wined3d_texture_get_level_pow2_width(ds_texture, depth_stencil->texture_level),
                     wined3d_texture_get_level_pow2_height(ds_texture, depth_stencil->texture_level),
@@ -1920,7 +1920,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain,
     gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ALIGNMENT, device->surface_alignment);
     checkGLcall("glPixelStorei(GL_PACK_ALIGNMENT, device->surface_alignment);");
     gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, device->surface_alignment);");
+    checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, 1);");
 
     if (gl_info->supported[ARB_VERTEX_BLEND])
     {
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 9bdc773..1b0d018 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -3662,7 +3662,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state
         {
             /* Note that WINED3D_SAMP_MAX_MIP_LEVEL specifies the largest mipmap
              * (default 0), while GL_TEXTURE_MAX_LEVEL specifies the smallest
-             * mimap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL
+             * mipmap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL
              * corresponds to GL_TEXTURE_BASE_LEVEL. */
             gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_BASE_LEVEL, base_level);
             gl_tex->base_level = base_level;
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index cf909de..aa654ff 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -1882,8 +1882,7 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info
         case WINED3D_GL_RES_TYPE_TEX_3D:
             gl_info->gl_ops.gl.p_glGenTextures(1, object);
             gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_3D, *object);
-            GL_EXTCALL(glTexImage3D)(GL_TEXTURE_3D, 0, internal, 16, 16, 16, 0,
-                    format, type, NULL);
+            GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, 0, internal, 16, 16, 16, 0, format, type, NULL));
             gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
             gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
@@ -2321,7 +2320,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for
         }
 
         delete_fbo_attachment(gl_info, type, object);
-        checkGLcall("Framebuffer format check cleaup");
+        checkGLcall("Framebuffer format check cleanup");
     }
 
     if (fallback_fmt_used && regular_fmt_used)




More information about the wine-cvs mailing list