r600g: add autogenerated reg definition + debug print cleanup

Signed-off-by: Jerome Glisse <jglisse@redhat.com>

1 files changed, 74 insertions, 78 deletions

diff --git a/src/gallium/drivers/r600/r600_state_inlines.h b/src/gallium/drivers/r600/r600_state_inlines.h
index 369263dc8f..26a5dd0432 100644
--- a/src/gallium/drivers/r600/r600_state_inlines.h
+++ b/src/gallium/drivers/r600/r600_state_inlines.h
@@ -18,79 +18,75 @@
  * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE. */
-
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 #ifndef R600_STATE_INLINES_H
 #define R600_STATE_INLINES_H
 
-#include "r600_reg.h"
-
 static INLINE uint32_t r600_translate_blend_function(int blend_func)
 {
 	switch (blend_func) {
-        case PIPE_BLEND_ADD:
-		return R600_BLEND_FCN_ADD;
-        case PIPE_BLEND_SUBTRACT:
-		return R600_BLEND_FCN_SUBTRACT;
-        case PIPE_BLEND_REVERSE_SUBTRACT:
-		return R600_BLEND_FCN_RSUB;
-        case PIPE_BLEND_MIN:
-		return R600_BLEND_FCN_MIN;
-        case PIPE_BLEND_MAX:
-		return R600_BLEND_FCN_MAX;
-        default:
-            fprintf(stderr, "r600: Unknown blend function %d\n", blend_func);
-            assert(0);
-            break;
-    }
-    return 0;
+	case PIPE_BLEND_ADD:
+		return V_028804_COMB_DST_PLUS_SRC;
+	case PIPE_BLEND_SUBTRACT:
+		return V_028804_COMB_SRC_MINUS_DST;
+	case PIPE_BLEND_REVERSE_SUBTRACT:
+		return V_028804_COMB_DST_MINUS_SRC;
+	case PIPE_BLEND_MIN:
+		return V_028804_COMB_MIN_DST_SRC;
+	case PIPE_BLEND_MAX:
+		return V_028804_COMB_MAX_DST_SRC;
+	default:
+		R600_ERR("Unknown blend function %d\n", blend_func);
+		assert(0);
+		break;
+	}
+	return 0;
 }
 
 static INLINE uint32_t r600_translate_blend_factor(int blend_fact)
 {
 	switch (blend_fact) {
-        case PIPE_BLENDFACTOR_ONE:
-		return R600_BLEND_ZERO;
-        case PIPE_BLENDFACTOR_SRC_COLOR:
-		return R600_BLEND_SRC_COLOR;
-        case PIPE_BLENDFACTOR_SRC_ALPHA:
-		return R600_BLEND_SRC_ALPHA;
-        case PIPE_BLENDFACTOR_DST_ALPHA:
-		return R600_BLEND_DST_ALPHA;
-        case PIPE_BLENDFACTOR_DST_COLOR:
-		return R600_BLEND_DST_COLOR;
-        case PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE:
-		return R600_BLEND_SRC_ALPHA_SATURATE;
-        case PIPE_BLENDFACTOR_CONST_COLOR:
-		return R600_BLEND_CONST_COLOR;
-        case PIPE_BLENDFACTOR_CONST_ALPHA:
-		return R600_BLEND_CONST_ALPHA;
-        case PIPE_BLENDFACTOR_ZERO:
-		return R600_BLEND_ZERO;
-        case PIPE_BLENDFACTOR_INV_SRC_COLOR:
-		return R600_BLEND_ONE_MINUS_SRC_COLOR;
-        case PIPE_BLENDFACTOR_INV_SRC_ALPHA:
-		return R600_BLEND_ONE_MINUS_SRC_ALPHA;
-        case PIPE_BLENDFACTOR_INV_DST_ALPHA:
-		return R600_BLEND_ONE_MINUS_DST_ALPHA;
-        case PIPE_BLENDFACTOR_INV_DST_COLOR:
-		return R600_BLEND_ONE_MINUS_DST_COLOR;
-        case PIPE_BLENDFACTOR_INV_CONST_COLOR:
-		return R600_BLEND_ONE_MINUS_CONST_COLOR;
-        case PIPE_BLENDFACTOR_INV_CONST_ALPHA:
-		return R600_BLEND_ONE_MINUS_CONST_ALPHA;
-
-        case PIPE_BLENDFACTOR_SRC1_COLOR:
-		return R600_BLEND_SRC1_COLOR;
-        case PIPE_BLENDFACTOR_SRC1_ALPHA:
-		return R600_BLEND_SRC1_ALPHA;
-        case PIPE_BLENDFACTOR_INV_SRC1_COLOR:
-		return R600_BLEND_INV_SRC1_COLOR;
-        case PIPE_BLENDFACTOR_INV_SRC1_ALPHA:
-		return R600_BLEND_INV_SRC1_ALPHA;
+	case PIPE_BLENDFACTOR_ONE:
+		return V_028804_BLEND_ZERO;
+	case PIPE_BLENDFACTOR_SRC_COLOR:
+		return V_028804_BLEND_SRC_COLOR;
+	case PIPE_BLENDFACTOR_SRC_ALPHA:
+		return V_028804_BLEND_SRC_ALPHA;
+	case PIPE_BLENDFACTOR_DST_ALPHA:
+		return V_028804_BLEND_DST_ALPHA;
+	case PIPE_BLENDFACTOR_DST_COLOR:
+		return V_028804_BLEND_DST_COLOR;
+	case PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE:
+		return V_028804_BLEND_SRC_ALPHA_SATURATE;
+	case PIPE_BLENDFACTOR_CONST_COLOR:
+		return V_028804_BLEND_CONST_COLOR;
+	case PIPE_BLENDFACTOR_CONST_ALPHA:
+		return V_028804_BLEND_CONST_ALPHA;
+	case PIPE_BLENDFACTOR_ZERO:
+		return V_028804_BLEND_ZERO;
+	case PIPE_BLENDFACTOR_INV_SRC_COLOR:
+		return V_028804_BLEND_ONE_MINUS_SRC_COLOR;
+	case PIPE_BLENDFACTOR_INV_SRC_ALPHA:
+		return V_028804_BLEND_ONE_MINUS_SRC_ALPHA;
+	case PIPE_BLENDFACTOR_INV_DST_ALPHA:
+		return V_028804_BLEND_ONE_MINUS_DST_ALPHA;
+	case PIPE_BLENDFACTOR_INV_DST_COLOR:
+		return V_028804_BLEND_ONE_MINUS_DST_COLOR;
+	case PIPE_BLENDFACTOR_INV_CONST_COLOR:
+		return V_028804_BLEND_ONE_MINUS_CONST_COLOR;
+	case PIPE_BLENDFACTOR_INV_CONST_ALPHA:
+		return V_028804_BLEND_ONE_MINUS_CONST_ALPHA;
+	case PIPE_BLENDFACTOR_SRC1_COLOR:
+		return V_028804_BLEND_SRC1_COLOR;
+	case PIPE_BLENDFACTOR_SRC1_ALPHA:
+		return V_028804_BLEND_SRC1_ALPHA;
+	case PIPE_BLENDFACTOR_INV_SRC1_COLOR:
+		return V_028804_BLEND_INV_SRC1_COLOR;
+	case PIPE_BLENDFACTOR_INV_SRC1_ALPHA:
+		return V_028804_BLEND_INV_SRC1_ALPHA;
 	default:
-		fprintf(stderr, "r600: Implementation error: "
-			"Bad blend factor %d not supported!\n", blend_fact);
+		R600_ERR("Bad blend factor %d not supported!\n", blend_fact);
 		assert(0);
 		break;
 	}
@@ -101,23 +97,23 @@ static INLINE uint32_t r600_translate_stencil_op(int s_op)
 {
 	switch (s_op) {
 	case PIPE_STENCIL_OP_KEEP:
-		return R600_ZS_KEEP;
-        case PIPE_STENCIL_OP_ZERO:
-		return R600_ZS_ZERO;
-        case PIPE_STENCIL_OP_REPLACE:
-		return R600_ZS_REPLACE;
-        case PIPE_STENCIL_OP_INCR:
-		return R600_ZS_INCR;
-        case PIPE_STENCIL_OP_DECR:
-		return R600_ZS_DECR;
-        case PIPE_STENCIL_OP_INCR_WRAP:
-		return R600_ZS_INCR_WRAP;
-        case PIPE_STENCIL_OP_DECR_WRAP:
-		return R600_ZS_DECR_WRAP;
-        case PIPE_STENCIL_OP_INVERT:
-		return R600_ZS_INVERT;
-        default:
-		fprintf(stderr, "r600: Unknown stencil op %d", s_op);
+		return V_028800_STENCIL_KEEP;
+	case PIPE_STENCIL_OP_ZERO:
+		return V_028800_STENCIL_ZERO;
+	case PIPE_STENCIL_OP_REPLACE:
+		return V_028800_STENCIL_REPLACE;
+	case PIPE_STENCIL_OP_INCR:
+		return V_028800_STENCIL_INCR;
+	case PIPE_STENCIL_OP_DECR:
+		return V_028800_STENCIL_DECR;
+	case PIPE_STENCIL_OP_INCR_WRAP:
+		return V_028800_STENCIL_INVERT;
+	case PIPE_STENCIL_OP_DECR_WRAP:
+		return V_028800_STENCIL_DECR_WRAP;
+	case PIPE_STENCIL_OP_INVERT:
+		return V_028800_STENCIL_INVERT;
+	default:
+		R600_ERR("Unknown stencil op %d", s_op);
 		assert(0);
 		break;
 	}