summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2015-04-15 02:04:17 -0700
committerKenneth Graunke <kenneth@whitecape.org>2015-04-17 12:07:33 -0700
commiteb6e770889536e44da0947b64955e9a923ba98f6 (patch)
tree430fd26a498a373e8512db8aead2faba627bb18a
parente9efd667defe13c89881f138cb5719c72573ff73 (diff)
i965: Delete some unnecessary code in brw_report_shader_time().
It is true that a gl_shader_program with ID 0 will be a fixed-function fragment program; a gl_program with ID 0 but NULL gl_shader_program means that it's a fixed-function vertex shader. But that's not terribly interesting or relevant to what we're doing. We just need to know that ID 0 means "fixed function". Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com> Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
-rw-r--r--src/mesa/drivers/dri/i965/brw_program.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index 0ca63de0cf..7ea08e6147 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -447,14 +447,9 @@ brw_report_shader_time(struct brw_context *brw)
if (prog) {
shader_num = prog->Name;
- /* The fixed function fragment shader generates GLSL IR with a Name
- * of 0, and nothing else does.
- */
if (prog->Label) {
shader_name = prog->Label;
- } else if (shader_num == 0 &&
- (brw->shader_time.types[i] == ST_FS8 ||
- brw->shader_time.types[i] == ST_FS16)) {
+ } else if (shader_num == 0) {
shader_name = "ff";
} else {
shader_name = "glsl";