summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mesa/pipe/i915simple/i915_surface.c1
-rw-r--r--src/mesa/pipe/p_context.h60
-rw-r--r--src/mesa/pipe/p_inlines.h89
-rw-r--r--src/mesa/pipe/softpipe/sp_state_blend.c2
-rw-r--r--src/mesa/pipe/softpipe/sp_state_rasterizer.c1
-rw-r--r--src/mesa/pipe/softpipe/sp_state_sampler.c1
-rw-r--r--src/mesa/pipe/softpipe/sp_surface.c1
-rw-r--r--src/mesa/pipe/softpipe/sp_tex_layout.c1
-rw-r--r--src/mesa/pipe/softpipe/sp_tex_sample.c2
-rw-r--r--src/mesa/pipe/softpipe/sp_tile_cache.c3
-rw-r--r--src/mesa/pipe/tgsi/exec/tgsi_exec.c6
-rw-r--r--src/mesa/state_tracker/st_cb_drawpixels.c1
-rw-r--r--src/mesa/state_tracker/st_cb_fbo.c1
13 files changed, 104 insertions, 65 deletions
diff --git a/src/mesa/pipe/i915simple/i915_surface.c b/src/mesa/pipe/i915simple/i915_surface.c
index b4b5bd1ce57..afe15fb525d 100644
--- a/src/mesa/pipe/i915simple/i915_surface.c
+++ b/src/mesa/pipe/i915simple/i915_surface.c
@@ -29,6 +29,7 @@
#include "i915_state.h"
#include "pipe/p_defines.h"
#include "pipe/p_util.h"
+#include "pipe/p_inlines.h"
#include "pipe/p_winsys.h"
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 3bd266674f5..33d18781580 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -29,7 +29,6 @@
#define PIPE_CONTEXT_H
#include "p_state.h"
-#include "p_util.h"
struct pipe_state_cache;
/**
@@ -246,63 +245,4 @@ struct pipe_context {
unsigned flags );
};
-
-/**
- * Set 'ptr' to point to 'region' and update reference counting.
- * The old thing pointed to, if any, will be unreferenced first.
- * 'region' may be NULL.
- */
-static INLINE void
-pipe_region_reference(struct pipe_region **ptr, struct pipe_region *region)
-{
- assert(ptr);
- if (*ptr) {
- /* unreference the old thing */
- struct pipe_region *oldReg = *ptr;
- assert(oldReg->refcount > 0);
- oldReg->refcount--;
- if (oldReg->refcount == 0) {
- /* free the old region */
- assert(oldReg->map_refcount == 0);
- /* XXX dereference the region->buffer */
- FREE( oldReg );
- }
- *ptr = NULL;
- }
- if (region) {
- /* reference the new thing */
- region->refcount++;
- *ptr = region;
- }
-}
-
-
-/**
- * \sa pipe_region_reference
- */
-static INLINE void
-pipe_surface_reference(struct pipe_surface **ptr, struct pipe_surface *surf)
-{
- assert(ptr);
- if (*ptr) {
- /* unreference the old thing */
- struct pipe_surface *oldSurf = *ptr;
- assert(oldSurf->refcount > 0);
- oldSurf->refcount--;
- if (oldSurf->refcount == 0) {
- /* free the old region */
- pipe_region_reference(&oldSurf->region, NULL);
- FREE( oldSurf );
- }
- *ptr = NULL;
- }
- if (surf) {
- /* reference the new thing */
- surf->refcount++;
- *ptr = surf;
- }
-}
-
-
#endif /* PIPE_CONTEXT_H */
-
diff --git a/src/mesa/pipe/p_inlines.h b/src/mesa/pipe/p_inlines.h
new file mode 100644
index 00000000000..ea666fa20ae
--- /dev/null
+++ b/src/mesa/pipe/p_inlines.h
@@ -0,0 +1,89 @@
+/**************************************************************************
+ *
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * 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, sub license, 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 NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS 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.
+ *
+ **************************************************************************/
+
+#ifndef P_INLINES_H
+#define P_INLINES_H
+
+#include "p_context.h"
+//#include "p_util.h"
+
+/**
+ * Set 'ptr' to point to 'region' and update reference counting.
+ * The old thing pointed to, if any, will be unreferenced first.
+ * 'region' may be NULL.
+ */
+static INLINE void
+pipe_region_reference(struct pipe_region **ptr, struct pipe_region *region)
+{
+ assert(ptr);
+ if (*ptr) {
+ /* unreference the old thing */
+ struct pipe_region *oldReg = *ptr;
+ assert(oldReg->refcount > 0);
+ oldReg->refcount--;
+ if (oldReg->refcount == 0) {
+ /* free the old region */
+ assert(oldReg->map_refcount == 0);
+ /* XXX dereference the region->buffer */
+ FREE( oldReg );
+ }
+ *ptr = NULL;
+ }
+ if (region) {
+ /* reference the new thing */
+ region->refcount++;
+ *ptr = region;
+ }
+}
+
+/**
+ * \sa pipe_region_reference
+ */
+static INLINE void
+pipe_surface_reference(struct pipe_surface **ptr, struct pipe_surface *surf)
+{
+ assert(ptr);
+ if (*ptr) {
+ /* unreference the old thing */
+ struct pipe_surface *oldSurf = *ptr;
+ assert(oldSurf->refcount > 0);
+ oldSurf->refcount--;
+ if (oldSurf->refcount == 0) {
+ /* free the old region */
+ pipe_region_reference(&oldSurf->region, NULL);
+ FREE( oldSurf );
+ }
+ *ptr = NULL;
+ }
+ if (surf) {
+ /* reference the new thing */
+ surf->refcount++;
+ *ptr = surf;
+ }
+}
+
+#endif /* P_INLINES_H */
diff --git a/src/mesa/pipe/softpipe/sp_state_blend.c b/src/mesa/pipe/softpipe/sp_state_blend.c
index e9e6a55e0dd..5ceec2513f1 100644
--- a/src/mesa/pipe/softpipe/sp_state_blend.c
+++ b/src/mesa/pipe/softpipe/sp_state_blend.c
@@ -27,6 +27,8 @@
/* Authors: Keith Whitwell <[email protected]>
*/
+
+#include "pipe/p_util.h"
#include "sp_context.h"
#include "sp_state.h"
diff --git a/src/mesa/pipe/softpipe/sp_state_rasterizer.c b/src/mesa/pipe/softpipe/sp_state_rasterizer.c
index a69e0d90123..ce8fa4f2b8b 100644
--- a/src/mesa/pipe/softpipe/sp_state_rasterizer.c
+++ b/src/mesa/pipe/softpipe/sp_state_rasterizer.c
@@ -26,6 +26,7 @@
**************************************************************************/
#include "pipe/p_defines.h"
+#include "pipe/p_util.h"
#include "sp_context.h"
#include "sp_state.h"
#include "pipe/draw/draw_context.h"
diff --git a/src/mesa/pipe/softpipe/sp_state_sampler.c b/src/mesa/pipe/softpipe/sp_state_sampler.c
index 7b528fbaf3b..246a7d6eda7 100644
--- a/src/mesa/pipe/softpipe/sp_state_sampler.c
+++ b/src/mesa/pipe/softpipe/sp_state_sampler.c
@@ -29,6 +29,7 @@
* Brian Paul
*/
+#include "pipe/p_util.h"
#include "sp_context.h"
#include "sp_state.h"
#include "sp_tile_cache.h"
diff --git a/src/mesa/pipe/softpipe/sp_surface.c b/src/mesa/pipe/softpipe/sp_surface.c
index 9d5529d8d6d..eeaf98ce36c 100644
--- a/src/mesa/pipe/softpipe/sp_surface.c
+++ b/src/mesa/pipe/softpipe/sp_surface.c
@@ -27,6 +27,7 @@
#include "pipe/p_defines.h"
#include "pipe/p_util.h"
+#include "pipe/p_inlines.h"
#include "pipe/p_winsys.h"
#include "sp_context.h"
#include "sp_state.h"
diff --git a/src/mesa/pipe/softpipe/sp_tex_layout.c b/src/mesa/pipe/softpipe/sp_tex_layout.c
index 3ac7bfcb736..8156b00301f 100644
--- a/src/mesa/pipe/softpipe/sp_tex_layout.c
+++ b/src/mesa/pipe/softpipe/sp_tex_layout.c
@@ -32,6 +32,7 @@
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
+#include "pipe/p_util.h"
#include "sp_tex_layout.h"
diff --git a/src/mesa/pipe/softpipe/sp_tex_sample.c b/src/mesa/pipe/softpipe/sp_tex_sample.c
index 0b91ef0e37f..e3e607d27c9 100644
--- a/src/mesa/pipe/softpipe/sp_tex_sample.c
+++ b/src/mesa/pipe/softpipe/sp_tex_sample.c
@@ -32,13 +32,13 @@
* Brian Paul
*/
-
#include "sp_context.h"
#include "sp_surface.h"
#include "sp_tex_sample.h"
#include "sp_tile_cache.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
+#include "pipe/p_util.h"
#include "pipe/tgsi/exec/tgsi_exec.h"
diff --git a/src/mesa/pipe/softpipe/sp_tile_cache.c b/src/mesa/pipe/softpipe/sp_tile_cache.c
index 473316b6742..9542ec37659 100644
--- a/src/mesa/pipe/softpipe/sp_tile_cache.c
+++ b/src/mesa/pipe/softpipe/sp_tile_cache.c
@@ -32,7 +32,8 @@
* Brian Paul
*/
-
+#include "pipe/p_util.h"
+#include "pipe/p_inlines.h"
#include "sp_context.h"
#include "sp_surface.h"
#include "sp_tile_cache.h"
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.c b/src/mesa/pipe/tgsi/exec/tgsi_exec.c
index 7607ded63a4..3494b21599a 100644
--- a/src/mesa/pipe/tgsi/exec/tgsi_exec.c
+++ b/src/mesa/pipe/tgsi/exec/tgsi_exec.c
@@ -50,10 +50,10 @@
* Brian Paul
*/
-#include "tgsi_platform.h"
-#include "tgsi_core.h"
+#include "pipe/p_compiler.h"
#include "pipe/p_state.h"
-
+#include "pipe/p_util.h"
+#include "tgsi_core.h"
#define TILE_TOP_LEFT 0
#define TILE_TOP_RIGHT 1
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 99e1e3ed25d..3c573174154 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -48,6 +48,7 @@
#include "st_mesa_to_tgsi.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
+#include "pipe/p_inlines.h"
#include "pipe/p_winsys.h"
#include "shader/prog_instruction.h"
diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 5512bdeed80..1ffd1a30b88 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -41,6 +41,7 @@
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
+#include "pipe/p_inlines.h"
#include "pipe/p_winsys.h"
#include "st_context.h"
#include "st_cb_fbo.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 06:25:27 +0000