summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_fs.h
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2009-11-26 19:37:58 +0100
committerCorbin Simpson <MostAwesomeDude@gmail.com>2009-12-01 01:20:26 -0800
commitcb90235135ef7c657053657f3bdfbda7ca70d708 (patch)
treea4e802bdecfb06fe8a742d77a3779276a7b6937f /src/gallium/drivers/r300/r300_fs.h
parent6f05eba0204a9f1371bb1ae5cdb0f71bb819eb28 (diff)
downloadexternal_mesa3d-cb90235135ef7c657053657f3bdfbda7ca70d708.zip
external_mesa3d-cb90235135ef7c657053657f3bdfbda7ca70d708.tar.gz
external_mesa3d-cb90235135ef7c657053657f3bdfbda7ca70d708.tar.bz2
r300g: clean up derived states
The state setups which aren't derived anymore have been moved to the VS and FS objects.
Diffstat (limited to 'src/gallium/drivers/r300/r300_fs.h')
-rw-r--r--src/gallium/drivers/r300/r300_fs.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_fs.h b/src/gallium/drivers/r300/r300_fs.h
index e831c30..630e2d0 100644
--- a/src/gallium/drivers/r300/r300_fs.h
+++ b/src/gallium/drivers/r300/r300_fs.h
@@ -1,6 +1,7 @@
/*
* Copyright 2008 Corbin Simpson <MostAwesomeDude@gmail.com>
* Joakim Sindholt <opensource@zhasha.com>
+ * Copyright 2009 Marek Olšák <maraeo@gmail.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -25,15 +26,16 @@
#define R300_FS_H
#include "pipe/p_state.h"
-
#include "tgsi/tgsi_scan.h"
-
#include "radeon_code.h"
+#include "r300_shader_semantics.h"
struct r300_fragment_shader {
/* Parent class */
struct pipe_shader_state state;
+
struct tgsi_shader_info info;
+ struct r300_shader_semantics inputs;
/* Has this shader been translated yet? */
boolean translated;