On Sat, Mar 14, 2015 at 9:54 PM, Jordan Justen <jordan.l.jus...@intel.com> wrote: > Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com>
Reviewed-by: Kristian Høgsberg <k...@bitplanet.net> > --- > src/mesa/drivers/dri/i965/Makefile.sources | 1 + > src/mesa/drivers/dri/i965/brw_cs.cpp | 48 > +++++++++++++++++++++++++++++ > src/mesa/drivers/dri/i965/brw_cs.h | 2 ++ > src/mesa/drivers/dri/i965/brw_state_cache.c | 3 ++ > 4 files changed, 54 insertions(+) > create mode 100644 src/mesa/drivers/dri/i965/brw_cs.cpp > > diff --git a/src/mesa/drivers/dri/i965/Makefile.sources > b/src/mesa/drivers/dri/i965/Makefile.sources > index c69441b..b2dccf8 100644 > --- a/src/mesa/drivers/dri/i965/Makefile.sources > +++ b/src/mesa/drivers/dri/i965/Makefile.sources > @@ -19,6 +19,7 @@ i965_FILES = \ > brw_clip_util.c \ > brw_context.c \ > brw_context.h \ > + brw_cs.cpp \ > brw_cubemap_normalize.cpp \ > brw_curbe.c \ > brw_dead_control_flow.cpp \ > diff --git a/src/mesa/drivers/dri/i965/brw_cs.cpp > b/src/mesa/drivers/dri/i965/brw_cs.cpp > new file mode 100644 > index 0000000..8021147 > --- /dev/null > +++ b/src/mesa/drivers/dri/i965/brw_cs.cpp > @@ -0,0 +1,48 @@ > +/* > + * Copyright (c) 2014 - 2015 Intel Corporation > + * > + * 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 "brw_context.h" > +#include "brw_cs.h" > + > +extern "C" > +bool > +brw_cs_prog_data_compare(const void *in_a, const void *in_b) > +{ > + const struct brw_cs_prog_data *a = > + (const struct brw_cs_prog_data *)in_a; > + const struct brw_cs_prog_data *b = > + (const struct brw_cs_prog_data *)in_b; > + > + /* Compare the base structure. */ > + if (!brw_stage_prog_data_compare(&a->base, &b->base)) > + return false; > + > + /* Compare the rest of the structure. */ > + const unsigned offset = sizeof(struct brw_stage_prog_data); > + if (memcmp(((char *) a) + offset, ((char *) b) + offset, > + sizeof(struct brw_cs_prog_data) - offset)) > + return false; > + > + return true; > +} > diff --git a/src/mesa/drivers/dri/i965/brw_cs.h > b/src/mesa/drivers/dri/i965/brw_cs.h > index 0e9e65a..e2c9779 100644 > --- a/src/mesa/drivers/dri/i965/brw_cs.h > +++ b/src/mesa/drivers/dri/i965/brw_cs.h > @@ -36,6 +36,8 @@ struct brw_cs_prog_key { > extern "C" { > #endif > > +bool brw_cs_prog_data_compare(const void *a, const void *b); > + > void > brw_upload_cs_prog(struct brw_context *brw); > > diff --git a/src/mesa/drivers/dri/i965/brw_state_cache.c > b/src/mesa/drivers/dri/i965/brw_state_cache.c > index 3b9d6cc..ecad6fa 100644 > --- a/src/mesa/drivers/dri/i965/brw_state_cache.c > +++ b/src/mesa/drivers/dri/i965/brw_state_cache.c > @@ -50,6 +50,7 @@ > #include "brw_vs.h" > #include "brw_wm.h" > #include "brw_gs.h" > +#include "brw_cs.h" > > #define FILE_DEBUG_FLAG DEBUG_STATE > > @@ -363,9 +364,11 @@ brw_init_caches(struct brw_context *brw) > cache->aux_compare[BRW_CACHE_VS_PROG] = brw_vs_prog_data_compare; > cache->aux_compare[BRW_CACHE_GS_PROG] = brw_gs_prog_data_compare; > cache->aux_compare[BRW_CACHE_FS_PROG] = brw_wm_prog_data_compare; > + cache->aux_compare[BRW_CACHE_CS_PROG] = brw_cs_prog_data_compare; > cache->aux_free[BRW_CACHE_VS_PROG] = brw_stage_prog_data_free; > cache->aux_free[BRW_CACHE_GS_PROG] = brw_stage_prog_data_free; > cache->aux_free[BRW_CACHE_FS_PROG] = brw_stage_prog_data_free; > + cache->aux_free[BRW_CACHE_CS_PROG] = brw_stage_prog_data_free; > } > > static void > -- > 2.1.4 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev