i915g: Move static state to its own file

diff --git a/src/gallium/drivers/i915/Makefile b/src/gallium/drivers/i915/Makefile
index 2cefe708500c5756f543cbdbb30198f5654741c0..d4d5c48fbb1df670af6eecec76a5d715359dcee8 100644 (file)
--- a/src/gallium/drivers/i915/Makefile
+++ b/src/gallium/drivers/i915/Makefile
@@ -16,6 +16,7 @@ C_SOURCES = \
        i915_state_derived.c \
        i915_state_emit.c \
        i915_state_sampler.c \
+       i915_state_static.c \
        i915_screen.c \
        i915_prim_emit.c \
        i915_prim_vbuf.c \

diff --git a/src/gallium/drivers/i915/SConscript b/src/gallium/drivers/i915/SConscript
index d6e7a8dbd370c932059c2e44bd5a0fe82793867f..a90d094919b10683a846431bafc9bd68cdc95781 100644 (file)
--- a/src/gallium/drivers/i915/SConscript
+++ b/src/gallium/drivers/i915/SConscript
@@ -27,6 +27,7 @@ i915 = env.ConvenienceLibrary(
                'i915_state_emit.c',
                'i915_state_immediate.c',
                'i915_state_sampler.c',
+               'i915_state_static.c',
                'i915_surface.c',
                'i915_resource.c',
                'i915_resource_texture.c',

diff --git a/src/gallium/drivers/i915/i915_state_derived.c b/src/gallium/drivers/i915/i915_state_derived.c
index c05954035710b8ccc7ed438a061f9202c7c93e42..38d13f4fc91de32fd8f573bce87879cfd4191421 100644 (file)
--- a/src/gallium/drivers/i915/i915_state_derived.c
+++ b/src/gallium/drivers/i915/i915_state_derived.c
@@ -171,24 +171,6 @@ struct i915_tracked_state i915_hw_fs = {
 
 
 
-/***********************************************************************
- * Update framebuffer state
- */
-static void update_framebuffer(struct i915_context *i915)
-{
-   /* HW emit currently references framebuffer state directly:
-    */
-   i915->hardware_dirty |= I915_HW_STATIC;
-}
-
-struct i915_tracked_state i915_hw_framebuffer = {
-   "framebuffer",
-   update_framebuffer,
-   I915_NEW_FRAMEBUFFER
-};
-
-
-
 /***********************************************************************
  */
 static struct i915_tracked_state *atoms[] = {

diff --git a/src/gallium/drivers/i915/i915_state_static.c b/src/gallium/drivers/i915/i915_state_static.c
new file mode 100644 (file)
index 0000000..e33a53a
--- /dev/null
+++ b/src/gallium/drivers/i915/i915_state_static.c
@@ -0,0 +1,48 @@
+/**************************************************************************
+ *
+ * Copyright © 2010 Jakob Bornecrantz
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ *
+ **************************************************************************/
+
+
+#include "i915_reg.h"
+#include "i915_context.h"
+#include "i915_resource.h"
+#include "i915_state.h"
+
+
+
+/***********************************************************************
+ * Update framebuffer state
+ */
+static void update_framebuffer(struct i915_context *i915)
+{
+   /* HW emit currently references framebuffer state directly:
+    */
+   i915->hardware_dirty |= I915_HW_STATIC;
+}
+
+struct i915_tracked_state i915_hw_framebuffer = {
+   "framebuffer",
+   update_framebuffer,
+   I915_NEW_FRAMEBUFFER
+};