r600g: Merge fix

This commit is contained in:
Christian König 2011-02-24 22:28:38 +01:00
parent b922a0ce12
commit 77217af40d

View file

@ -309,7 +309,16 @@ static boolean permit_hardware_blit(struct pipe_screen *screen,
PIPE_BIND_SAMPLER_VIEW, 0))
return FALSE;
return TRUE;
switch (res->usage) {
case PIPE_USAGE_STREAM:
case PIPE_USAGE_STAGING:
case PIPE_USAGE_STATIC:
case PIPE_USAGE_IMMUTABLE:
return FALSE;
default:
return TRUE;
}
}
static boolean r600_texture_get_handle(struct pipe_screen* screen,