Merge freedesktop/master into otc-private/master

[android-x86/external-mesa.git] / src / gallium / drivers / freedreno / a2xx / fd2_rasterizer.h

diff --git a/src/gallium/drivers/freedreno/freedreno_rasterizer.h b/src/gallium/drivers/freedreno/a2xx/fd2_rasterizer.h
similarity index 77%
rename from src/gallium/drivers/freedreno/freedreno_rasterizer.h
rename to src/gallium/drivers/freedreno/a2xx/fd2_rasterizer.h
index 519a05e..adc0653 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_rasterizer.h
+++ b/src/gallium/drivers/freedreno/a2xx/fd2_rasterizer.h
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
 
 /*
- * Copyright (C) 2012 Rob Clark <robclark@freedesktop.org>
+ * Copyright (C) 2012-2013 Rob Clark <robclark@freedesktop.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,13 +26,13 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifndef FREEDRENO_RASTERIZER_H_
-#define FREEDRENO_RASTERIZER_H_
+#ifndef FD2_RASTERIZER_H_
+#define FD2_RASTERIZER_H_
 
 #include "pipe/p_state.h"
 #include "pipe/p_context.h"
 
-struct fd_rasterizer_stateobj {
+struct fd2_rasterizer_stateobj {
        struct pipe_rasterizer_state base;
        uint32_t pa_sc_line_stipple;
        uint32_t pa_cl_clip_cntl;
@@ -43,6 +43,13 @@ struct fd_rasterizer_stateobj {
        uint32_t pa_su_sc_mode_cntl;
 };
 
-void fd_rasterizer_init(struct pipe_context *pctx);
+static INLINE struct fd2_rasterizer_stateobj *
+fd2_rasterizer_stateobj(struct pipe_rasterizer_state *rast)
+{
+       return (struct fd2_rasterizer_stateobj *)rast;
+}
 
-#endif /* FREEDRENO_RASTERIZER_H_ */
+void * fd2_rasterizer_state_create(struct pipe_context *pctx,
+               const struct pipe_rasterizer_state *cso);
+
+#endif /* FD2_RASTERIZER_H_ */