NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

st/nine: Fix Lock Checks for Compressed textures

Browse source 
Signed-off-by: Axel Davy <axel.davy@ens.fr>
This commit is contained in:
Axel Davy 2015-05-14 17:22:26 +02:00
parent d0daec1797
commit f396cd43ab
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/state_trackers/nine/surface9.c
View file

@ -347,12 +347,14 @@ NineSurface9_LockRect( struct NineSurface9 *This,
user_assert(This->desc.MultiSampleType == D3DMULTISAMPLE_NONE,
D3DERR_INVALIDCALL);
if (pRect && This->base.pool == D3DPOOL_DEFAULT &&
util_format_is_compressed(This->base.info.format)) {
if (pRect && This->desc.Pool == D3DPOOL_DEFAULT &&
compressed_format (This->desc.Format)) {
const unsigned w = util_format_get_blockwidth(This->base.info.format);
const unsigned h = util_format_get_blockheight(This->base.info.format);
user_assert(!(pRect->left % w) && !(pRect->right % w) &&
!(pRect->top % h) && !(pRect->bottom % h),
user_assert((pRect->left == 0 && pRect->right == This->desc.Width &&
pRect->top == 0 && pRect->bottom == This->desc.Height) ||
(!(pRect->left % w) && !(pRect->right % w) &&
!(pRect->top % h) && !(pRect->bottom % h)),
D3DERR_INVALIDCALL);
}

9
src/gallium/state_trackers/nine/volume9.c
View file

@ -244,12 +244,13 @@ NineVolume9_LockBox( struct NineVolume9 *This,
user_assert(!((Flags & D3DLOCK_DISCARD) && (Flags & D3DLOCK_READONLY)),
D3DERR_INVALIDCALL);
if (pBox && This->desc.Pool == D3DPOOL_DEFAULT &&
util_format_is_compressed(This->info.format)) {
if (pBox && compressed_format (This->desc.Format)) { /* For volume all pools are checked */
const unsigned w = util_format_get_blockwidth(This->info.format);
const unsigned h = util_format_get_blockheight(This->info.format);
user_assert(!(pBox->Left % w) && !(pBox->Right % w) &&
!(pBox->Top % h) && !(pBox->Bottom % h),
user_assert((pBox->Left == 0 && pBox->Right == This->desc.Width &&
pBox->Top == 0 && pBox->Bottom == This->desc.Height) ||
(!(pBox->Left % w) && !(pBox->Right % w) &&
!(pBox->Top % h) && !(pBox->Bottom % h)),
D3DERR_INVALIDCALL);
}