projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
st/nine: Fix present_buffers allocation
[mesa.git]
/
src
/
gallium
/
state_trackers
/
nine
/
pixelshader9.c
diff --git
a/src/gallium/state_trackers/nine/pixelshader9.c
b/src/gallium/state_trackers/nine/pixelshader9.c
index 3d68274aa01dbf1957be44c3aefe158b8fca6258..3f176a312bf586ed183e74294704694c7a5248ee 100644
(file)
--- a/
src/gallium/state_trackers/nine/pixelshader9.c
+++ b/
src/gallium/state_trackers/nine/pixelshader9.c
@@
-39,6
+39,8
@@
NinePixelShader9_ctor( struct NinePixelShader9 *This,
struct nine_shader_info info;
HRESULT hr;
struct nine_shader_info info;
HRESULT hr;
+ DBG("This=%p pParams=%p pFunction=%p cso=%p\n", This, pParams, pFunction, cso);
+
hr = NineUnknown_ctor(&This->base, pParams);
if (FAILED(hr))
return hr;
hr = NineUnknown_ctor(&This->base, pParams);
if (FAILED(hr))
return hr;
@@
-70,9
+72,9
@@
NinePixelShader9_ctor( struct NinePixelShader9 *This,
This->sampler_mask = info.sampler_mask;
This->rt_mask = info.rt_mask;
This->const_used_size = info.const_used_size;
This->sampler_mask = info.sampler_mask;
This->rt_mask = info.rt_mask;
This->const_used_size = info.const_used_size;
- if (info.const_used_size == ~0)
-
This->const_used_size = NINE_CONSTBUF_SIZE(device->max_ps_const_f
);
-
This->lconstf = info.lconstf
;
+ /* no constant relative addressing for ps */
+
assert(info.lconstf.data == NULL
);
+
assert(info.lconstf.ranges == NULL)
;
return D3D_OK;
}
return D3D_OK;
}
@@
-96,11
+98,7
@@
NinePixelShader9_dtor( struct NinePixelShader9 *This )
}
nine_shader_variants_free(&This->variant);
}
nine_shader_variants_free(&This->variant);
- if (This->byte_code.tokens)
- FREE((void *)This->byte_code.tokens); /* const_cast */
-
- FREE(This->lconstf.data);
- FREE(This->lconstf.ranges);
+ FREE((void *)This->byte_code.tokens); /* const_cast */
NineUnknown_dtor(&This->base);
}
NineUnknown_dtor(&This->base);
}
@@
-110,6
+108,8
@@
NinePixelShader9_GetFunction( struct NinePixelShader9 *This,
void *pData,
UINT *pSizeOfData )
{
void *pData,
UINT *pSizeOfData )
{
+ DBG("This=%p pData=%p pSizeOfData=%p\n", This, pData, pSizeOfData);
+
user_assert(pSizeOfData, D3DERR_INVALIDCALL);
if (!pData) {
user_assert(pSizeOfData, D3DERR_INVALIDCALL);
if (!pData) {