AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/dri: add null-pointer check, remove duplicated local variable

Browse Source 
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Marek Olšák
2013-01-21 15:48:55 +01:00
parent 0261b4ecdb
commit fffe3e0908
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/dri/common/dri_drawable.c
+5 -4
View File
@@ -446,6 +446,7 @@ dri_flush(__DRIcontext *cPriv,
/* Flush the context and throttle if needed. */
if (dri_screen(ctx->sPriv)->throttling_enabled &&
drawable &&
(reason == __DRI2_THROTTLE_SWAPBUFFER ||
reason == __DRI2_THROTTLE_FLUSHFRONT)) {
/* Throttle.
@@ -458,19 +459,19 @@ dri_flush(__DRIcontext *cPriv,
* pushes that fence on the queue. This requires that the st_context_iface
* flush method returns a fence even if there are no commands to flush.
*/
struct dri_drawable *draw = dri_drawable(dPriv);
struct pipe_screen *screen = draw->screen->base.screen;
struct pipe_screen *screen = drawable->screen->base.screen;
struct pipe_fence_handle *fence;
fence = swap_fences_pop_front(draw);
fence = swap_fences_pop_front(drawable);
if (fence) {
(void) screen->fence_finish(screen, fence, PIPE_TIMEOUT_INFINITE);
screen->fence_reference(screen, &fence, NULL);
}
ctx->st->flush(ctx->st, flush_flags, &fence);
if (fence) {
swap_fences_push_back(draw, fence);
swap_fences_push_back(drawable, fence);
screen->fence_reference(screen, &fence, NULL);
}
}