flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-11 18:06:13 +00:00
Code Issues Releases Wiki Activity

shut up the compiler a bit

Browse Source 
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2012-07-21 17:36:36 +02:00
parent 4c9abd5aa4
commit 434be47f12
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/intel_batchbuffer.c
View File

@ -106,7 +106,6 @@ flush_on_ring_common(struct intel_batchbuffer *batch, int ring)
void void
intel_batchbuffer_flush_on_ring(struct intel_batchbuffer *batch, int ring) intel_batchbuffer_flush_on_ring(struct intel_batchbuffer *batch, int ring)
{ {
int ret;
unsigned int used = flush_on_ring_common(batch, ring); unsigned int used = flush_on_ring_common(batch, ring);
if (used == 0) if (used == 0)

1
tests/flip_test.c
View File

@ -270,7 +270,6 @@ static void set_mode(struct test_output *o, int crtc)
drmHandleEvent(drm_fd, &evctx); drmHandleEvent(drm_fd, &evctx);
} }
out:
fprintf(stdout, "page flipping on crtc %d, connector %d: PASSED\n", fprintf(stdout, "page flipping on crtc %d, connector %d: PASSED\n",
crtc, o->id); crtc, o->id);

3
tests/gem_ctx_create.c
View File

@ -49,7 +49,8 @@ int main(int argc, char *argv[])
ret = drmIoctl(fd, CONTEXT_CREATE_IOCTL, &create); ret = drmIoctl(fd, CONTEXT_CREATE_IOCTL, &create);
if (ret != 0 && (errno == ENODEV || errno == EINVAL)) { if (ret != 0 && (errno == ENODEV || errno == EINVAL)) {
fprintf(stderr, "Kernel is too old, or contexts not supported\n", strerror(errno)); fprintf(stderr, "Kernel is too old, or contexts not supported: %s\n",
strerror(errno));
exit(77); exit(77);
} else if (ret != 0) { } else if (ret != 0) {
fprintf(stderr, "%s\n", strerror(errno)); fprintf(stderr, "%s\n", strerror(errno));

12
tests/testdisplay.c
View File

@ -335,7 +335,7 @@ paint_color_key(void)
} }
static void static void
paint_output_info(cairo_t *cr, int width, int height, void *priv) paint_output_info(cairo_t *cr, int l_width, int l_height, void *priv)
{ {
struct connector *c = priv; struct connector *c = priv;
cairo_text_extents_t name_extents, mode_extents; cairo_text_extents_t name_extents, mode_extents;
@ -358,9 +358,9 @@ paint_output_info(cairo_t *cr, int width, int height, void *priv)
cairo_text_extents(cr, mode_buf, &mode_extents); cairo_text_extents(cr, mode_buf, &mode_extents);
/* Paint output name */ /* Paint output name */
x = width / 2; x = l_width / 2;
x -= name_extents.width / 2; x -= name_extents.width / 2;
y = height / 2; y = l_height / 2;
y -= (name_extents.height / 2) - (mode_extents.height / 2) - 10; y -= (name_extents.height / 2) - (mode_extents.height / 2) - 10;
cairo_set_font_size(cr, 48); cairo_set_font_size(cr, 48);
cairo_move_to(cr, x, y); cairo_move_to(cr, x, y);
@ -371,10 +371,10 @@ paint_output_info(cairo_t *cr, int width, int height, void *priv)
cairo_fill(cr); cairo_fill(cr);
/* Paint mode name */ /* Paint mode name */
x = width / 2; x = l_width / 2;
x -= mode_extents.width / 2; x -= mode_extents.width / 2;
modes_x = x; modes_x = x;
y = height / 2; y = l_height / 2;
y += (mode_extents.height / 2) + (name_extents.height / 2) + 10; y += (mode_extents.height / 2) + (name_extents.height / 2) + 10;
cairo_set_font_size(cr, 36); cairo_set_font_size(cr, 36);
cairo_move_to(cr, x, y); cairo_move_to(cr, x, y);
@ -424,7 +424,7 @@ paint_output_info(cairo_t *cr, int width, int height, void *priv)
static void static void
set_mode(struct connector *c) set_mode(struct connector *c)
{ {
unsigned int fb_id; unsigned int fb_id = 0;
int j, test_mode_num; int j, test_mode_num;
if (depth <= 8) if (depth <= 8)