From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Dirsch Subject: [PATCH] intel-gpu-tools: Fixes-compiler-warnings-about-wrong-function-type Date: Mon, 24 Aug 2015 11:59:48 +0200 Message-ID: <20150824095948.GA8349@suse.de> Reply-To: sndirsch@suse.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="YZ5djTAD1cGYuMQK" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 326066E937 for ; Mon, 24 Aug 2015 02:59:52 -0700 (PDT) Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2BA13ACD4 for ; Mon, 24 Aug 2015 09:59:50 +0000 (UTC) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Find a simple buildfix against current intel-gpu-tools git sources attach= ed. Thanks, Stefan Public Key available ------------------------------------------------------ Stefan Dirsch (Res. & Dev.) SUSE LINUX GmbH Tel: 0911-740 53 0 Maxfeldstra=DFe 5 FAX: 0911-740 53 479 D-90409 N=FCrnberg http://www.suse.de Germany=20 --------------------------------------------------------------- SUSE Linux GmbH, GF: Felix Imend=F6rffer, Jane Smithard, Graham Norton, HRB 21284 (AG N=FCrnberg) --------------------------------------------------------------- --YZ5djTAD1cGYuMQK Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="0001-Fixes-compiler-warnings-about-wrong-function-type.patch" >>From 89822e4caba0868b397afb141a9f561a254fe92c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 21 Aug 2015 12:40:23 +0200 Subject: [PATCH] Fixes compiler warnings about wrong function type. Makes definition of function types for gen8_setup_null_render_state and gen9_setup_null_render_state consistent with the ones from functions for earlier GPU families like gen6_setup_null_render_state, gen7_setup_null_render_state, ... Signed-off-by: Stefan Dirsch --- tools/null_state_gen/intel_renderstate_gen8.c | 5 +---- tools/null_state_gen/intel_renderstate_gen9.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tools/null_state_gen/intel_renderstate_gen8.c b/tools/null_state_gen/intel_renderstate_gen8.c index 2d7a4b0..58ba6fa 100644 --- a/tools/null_state_gen/intel_renderstate_gen8.c +++ b/tools/null_state_gen/intel_renderstate_gen8.c @@ -322,11 +322,8 @@ static void gen8_emit_primitive(struct intel_batchbuffer *batch) OUT_BATCH(0); /* index buffer offset, ignored */ } -int gen8_setup_null_render_state(struct intel_batchbuffer *batch) +void gen8_setup_null_render_state(struct intel_batchbuffer *batch) { - int ret; - int i; - #define GEN8_PIPE_CONTROL_GLOBAL_GTT (1 << 24) OUT_BATCH(GEN6_PIPE_CONTROL | (6 - 2)); diff --git a/tools/null_state_gen/intel_renderstate_gen9.c b/tools/null_state_gen/intel_renderstate_gen9.c index 37bc675..08ee7ba 100644 --- a/tools/null_state_gen/intel_renderstate_gen9.c +++ b/tools/null_state_gen/intel_renderstate_gen9.c @@ -342,9 +342,8 @@ static void gen9_emit_state_base_address(struct intel_batchbuffer *batch) { * Generate the batch buffer commands needed to initialize the 3D engine * to its "golden state". */ -int gen9_setup_null_render_state(struct intel_batchbuffer *batch) +void gen9_setup_null_render_state(struct intel_batchbuffer *batch) { - int ret; int i; #define GEN8_PIPE_CONTROL_GLOBAL_GTT (1 << 24) @@ -477,6 +476,4 @@ int gen9_setup_null_render_state(struct intel_batchbuffer *batch) gen8_emit_primitive(batch); OUT_BATCH(MI_BATCH_BUFFER_END); - - return ret; } -- 1.8.4.5 --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK --YZ5djTAD1cGYuMQK--