i965/cs: Add BRW_NEW_CS_PROG_DATA and BRW_CACHE_CS_PROG
authorJordan Justen <jordan.l.justen@intel.com>
Sun, 25 Jan 2015 05:35:54 +0000 (21:35 -0800)
committerJordan Justen <jordan.l.justen@intel.com>
Sat, 2 May 2015 07:34:28 +0000 (00:34 -0700)
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/mesa/drivers/dri/i965/brw_context.h
src/mesa/drivers/dri/i965/brw_state_dump.c
src/mesa/drivers/dri/i965/brw_state_upload.c

index bd253efb3e27390e13da79ac15250d33282c3791..f131c7003ff5c152fd3e150d78c673cd29fc8890 100644 (file)
@@ -164,6 +164,7 @@ enum brw_cache_id {
    BRW_CACHE_FF_GS_PROG,
    BRW_CACHE_GS_PROG,
    BRW_CACHE_CLIP_PROG,
+   BRW_CACHE_CS_PROG,
 
    BRW_MAX_CACHE
 };
@@ -245,6 +246,7 @@ enum brw_state_id {
 #define BRW_NEW_FF_GS_PROG_DATA         (1ull << BRW_CACHE_FF_GS_PROG)
 #define BRW_NEW_GS_PROG_DATA            (1ull << BRW_CACHE_GS_PROG)
 #define BRW_NEW_CLIP_PROG_DATA          (1ull << BRW_CACHE_CLIP_PROG)
+#define BRW_NEW_CS_PROG_DATA            (1ull << BRW_CACHE_CS_PROG)
 #define BRW_NEW_URB_FENCE               (1ull << BRW_STATE_URB_FENCE)
 #define BRW_NEW_FRAGMENT_PROGRAM        (1ull << BRW_STATE_FRAGMENT_PROGRAM)
 #define BRW_NEW_GEOMETRY_PROGRAM        (1ull << BRW_STATE_GEOMETRY_PROGRAM)
index 5cf70eb7a20920c024636bb7689aa14cabcc5dac..530f5a8b76e1c3842d64affa0d7cdc8157635e34 100644 (file)
@@ -490,6 +490,9 @@ dump_prog_cache(struct brw_context *brw)
         case BRW_CACHE_FS_PROG:
            name = "FS kernel";
            break;
+         case BRW_CACHE_CS_PROG:
+            name = "CS kernel";
+            break;
         default:
            name = "unknown";
            break;
index 435f75907b092afec8474a0daa22f316d2653e5b..5c5420d2e828a20efe5cbcf8f1fd912a5b203cc8 100644 (file)
@@ -541,6 +541,7 @@ static struct dirty_bit_map brw_bits[] = {
    DEFINE_BIT(BRW_NEW_FF_GS_PROG_DATA),
    DEFINE_BIT(BRW_NEW_GS_PROG_DATA),
    DEFINE_BIT(BRW_NEW_CLIP_PROG_DATA),
+   DEFINE_BIT(BRW_NEW_CS_PROG_DATA),
    DEFINE_BIT(BRW_NEW_URB_FENCE),
    DEFINE_BIT(BRW_NEW_FRAGMENT_PROGRAM),
    DEFINE_BIT(BRW_NEW_GEOMETRY_PROGRAM),