wined3d: Use the proper texture target in arbfp_blit_set().

For cube maps, texture->target is GL_TEXTURE_CUBE_MAP and would be used for calls that apply to the entire texture, like glTexParameter(). surface->texture_target refers to individual faces like GL_TEXTURE_CUBE_MAP_POSITIVE_X, etc., and would be used for calls like glTexImage2D(). What makes this a bit ugly is the fact that surfaces don't always have an associated texture.

wined3d: Use the proper texture target in arbfp_blit_set().
86db5b60 · Henri Verbeet · Alexandre Julliard · 80ebe35a · 86db5b60
Commit 86db5b60 authored Jul 17, 2012 by Henri Verbeet Committed by Alexandre Julliard Jul 17, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

arb_program_shader.c dlls/wined3d/arb_program_shader.c +6 -1

No files found.
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -7196,8 +7196,13 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, 
    float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f};
    struct arbfp_blit_priv *priv = blit_priv;
    enum complex_fixup fixup;
-    GLenum textype = surface->texture_target;
    const struct wined3d_gl_info *gl_info = context->gl_info;
+    GLenum textype;
+
+    if (surface->container.type == WINED3D_CONTAINER_TEXTURE)
+        textype = surface->container.u.texture->target;
+    else
+        textype = surface->texture_target;

    if (surface->flags & SFLAG_CONVERTED)
    {