X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fstate_trackers%2Fnine%2Fpixelshader9.c;h=3f176a312bf586ed183e74294704694c7a5248ee;hb=8b901e3011c268d0a093a65b072bb51db0dcd251;hp=3d68274aa01dbf1957be44c3aefe158b8fca6258;hpb=fdd96578ef2dfe9c4ad5aab5858036298d444a64;p=mesa.git diff --git a/src/gallium/state_trackers/nine/pixelshader9.c b/src/gallium/state_trackers/nine/pixelshader9.c index 3d68274aa01..3f176a312bf 100644 --- 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; + 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; @@ -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; - 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; } @@ -96,11 +98,7 @@ NinePixelShader9_dtor( struct NinePixelShader9 *This ) } 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); } @@ -110,6 +108,8 @@ NinePixelShader9_GetFunction( struct NinePixelShader9 *This, void *pData, UINT *pSizeOfData ) { + DBG("This=%p pData=%p pSizeOfData=%p\n", This, pData, pSizeOfData); + user_assert(pSizeOfData, D3DERR_INVALIDCALL); if (!pData) {