summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.sources2
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.h2
-rw-r--r--src/mesa/drivers/dri/i965/brw_program_cache.c (renamed from src/mesa/drivers/dri/i965/brw_state_cache.c)12
-rw-r--r--src/mesa/drivers/dri/i965/brw_state.h2
4 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index 30648e313fd..1c33ea55fae 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -139,6 +139,7 @@ i965_FILES = \
brw_pipe_control.c \
brw_program.c \
brw_program.h \
+ brw_program_cache.c \
brw_primitive_restart.c \
brw_queryobj.c \
brw_reset.c \
@@ -148,7 +149,6 @@ i965_FILES = \
brw_sf.h \
brw_sf_state.c \
brw_state_batch.c \
- brw_state_cache.c \
brw_state_dump.c \
brw_state.h \
brw_state_upload.c \
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 310372ac82f..3a88e56b51e 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -178,7 +178,7 @@ enum brw_cache_id {
};
enum brw_state_id {
- /* brw_cache_ids must come first - see brw_state_cache.c */
+ /* brw_cache_ids must come first - see brw_program_cache.c */
BRW_STATE_URB_FENCE = BRW_MAX_CACHE,
BRW_STATE_FRAGMENT_PROGRAM,
BRW_STATE_GEOMETRY_PROGRAM,
diff --git a/src/mesa/drivers/dri/i965/brw_state_cache.c b/src/mesa/drivers/dri/i965/brw_program_cache.c
index e8e71ab229f..4a67b96718b 100644
--- a/src/mesa/drivers/dri/i965/brw_state_cache.c
+++ b/src/mesa/drivers/dri/i965/brw_program_cache.c
@@ -29,13 +29,13 @@
* Keith Whitwell <[email protected]>
*/
-/** @file brw_state_cache.c
+/** @file brw_program_cache.c
*
- * This file implements a simple static state cache for 965. The
- * consumers can query the hash table of state using a cache_id,
- * opaque key data, and receive the corresponding state buffer object
- * of state (plus associated auxiliary data) in return. Objects in
- * the cache may not have relocations (pointers to other BOs) in them.
+ * This file implements a simple program cache for 965. The consumers can
+ * query the hash table of programs using a cache_id and program key, and
+ * receive the corresponding program buffer object (plus associated auxiliary
+ * data) in return. Objects in the cache may not have relocations
+ * (pointers to other BOs) in them.
*
* The inner workings are a simple hash table based on a CRC of the
* key data.
diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h
index 841c3dee5a5..38c2cbc3d18 100644
--- a/src/mesa/drivers/dri/i965/brw_state.h
+++ b/src/mesa/drivers/dri/i965/brw_state.h
@@ -217,7 +217,7 @@ brw_select_pipeline(struct brw_context *brw, enum brw_pipeline pipeline)
}
/***********************************************************************
- * brw_state_cache.c
+ * brw_program_cache.c
*/
void brw_upload_cache(struct brw_cache *cache,