wined3d: Set GL_UNPACK_ALIGNMENT to 1.

Alignment should be taken care by the surface pitch and GL_UNPACK_ROW_LENGTH alone just fine, as long as the pitch is a multiple of the pixel size. Client APIs respect that, internally we need to do the same and the changes to surface_load_texture and wined3d_volume_upload_data are there for this reason (e.g. WINED3DFMT_R16G16_SNORM is emulated with GL_RGB16 when NV_texture_shader isn't supported).

wined3d: Set GL_UNPACK_ALIGNMENT to 1.
78ae4f66 · Matteo Bruni · Alexandre Julliard · d91ba373 · 78ae4f66 · 78ae4f66
Commit 78ae4f66 authored Feb 20, 2015 by Matteo Bruni Committed by Alexandre Julliard Feb 20, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

context.c dlls/wined3d/context.c +1 -1

surface.c dlls/wined3d/surface.c +0 -1

volume.c dlls/wined3d/volume.c +0 -2

No files found.
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -1685,7 +1685,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, device->surface_alignment);
+    gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
    checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, device->surface_alignment);");

    if (gl_info->supported[ARB_VERTEX_BLEND])

--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4192,7 +4192,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,

        format.byte_count = format.conv_byte_count;
        dst_pitch = wined3d_format_calculate_pitch(&format, width);
-        dst_pitch = (dst_pitch + device->surface_alignment - 1) & ~(device->surface_alignment - 1);

        if (!(mem = HeapAlloc(GetProcessHeap(), 0, dst_pitch * height)))
        {

--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -84,7 +84,6 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine
    {
        UINT dst_row_pitch, dst_slice_pitch;
        UINT src_row_pitch, src_slice_pitch;
-        UINT alignment = volume->resource.device->surface_alignment;

        if (data->buffer_object)
            ERR("Loading a converted volume from a PBO.\n");
@@ -92,7 +91,6 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine
            ERR("Converting a block-based format.\n");

        dst_row_pitch = width * format->conv_byte_count;
-        dst_row_pitch = (dst_row_pitch + alignment - 1) & ~(alignment - 1);
        dst_slice_pitch = dst_row_pitch * height;

        wined3d_volume_get_pitch(volume, &src_row_pitch, &src_slice_pitch);