summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/nine/texture9.c
diff options
context:
space:
mode:
authorAxel Davy <[email protected]>2014-11-25 00:38:02 +0100
committerEmil Velikov <[email protected]>2014-11-26 20:09:10 +0000
commit133b2087c5ba9942527bc1b218a32205fb7a10a6 (patch)
tree3c96b5bc16a1d23e286e0c022fdae4e7941d7331 /src/gallium/state_trackers/nine/texture9.c
parent104b5a81933b7a2f4fa24302a1d972ad3dd0dec6 (diff)
st/nine: Rework Basetexture9 and Resource9.
Instead of having parts of the structures initialised by the parents, have them initialised by the children. Cc: "10.4" <[email protected]> Tested-by: David Heidelberg <[email protected]> Signed-off-by: Axel Davy <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/nine/texture9.c')
-rw-r--r--src/gallium/state_trackers/nine/texture9.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/nine/texture9.c b/src/gallium/state_trackers/nine/texture9.c
index c13268db9fd..e30f955aa0f 100644
--- a/src/gallium/state_trackers/nine/texture9.c
+++ b/src/gallium/state_trackers/nine/texture9.c
@@ -94,9 +94,6 @@ NineTexture9_ctor( struct NineTexture9 *This,
if (Usage & D3DUSAGE_AUTOGENMIPMAP)
Levels = 0;
- This->base.format = Format;
- This->base.base.usage = Usage;
-
info->screen = screen;
info->target = PIPE_TEXTURE_2D;
info->format = d3d9_to_pipe_format(Format);
@@ -148,7 +145,7 @@ NineTexture9_ctor( struct NineTexture9 *This,
if (!This->surfaces)
return E_OUTOFMEMORY;
- hr = NineBaseTexture9_ctor(&This->base, pParams, D3DRTYPE_TEXTURE, Pool);
+ hr = NineBaseTexture9_ctor(&This->base, pParams, NULL, D3DRTYPE_TEXTURE, Format, Pool, Usage);
if (FAILED(hr))
return hr;
This->base.pstype = (Height == 1) ? 1 : 0;