From 79989a0e3f2118d99ffe679d005560421613a30a Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Sun, 18 Oct 2020 00:00:40 -0700 Subject: [PATCH] nv2a: Always use texture cache --- hw/xbox/nv2a/nv2a_int.h | 2 -- hw/xbox/nv2a/pgraph.c | 5 ----- 2 files changed, 7 deletions(-) diff --git a/hw/xbox/nv2a/nv2a_int.h b/hw/xbox/nv2a/nv2a_int.h index 954f33c4b4..b115ec7616 100644 --- a/hw/xbox/nv2a/nv2a_int.h +++ b/hw/xbox/nv2a/nv2a_int.h @@ -48,8 +48,6 @@ #include "shaders.h" #include "nv2a_regs.h" -#define USE_TEXTURE_CACHE 1 - #define GET_MASK(v, mask) (((v) & (mask)) >> ctz32(mask)) #define SET_MASK(v, mask, val) \ diff --git a/hw/xbox/nv2a/pgraph.c b/hw/xbox/nv2a/pgraph.c index e5c3ef5f2d..6b2d29e292 100644 --- a/hw/xbox/nv2a/pgraph.c +++ b/hw/xbox/nv2a/pgraph.c @@ -3839,7 +3839,6 @@ static void pgraph_bind_textures(NV2AState *d) .pitch = pitch, }; -#ifdef USE_TEXTURE_CACHE uint64_t texture_hash = fast_hash(texture_data, length, 5003) ^ fnv_hash(palette_data, palette_length); @@ -3854,10 +3853,6 @@ static void pgraph_bind_textures(NV2AState *d) assert((key_out != NULL) && (key_out->binding != NULL)); TextureBinding *binding = key_out->binding; binding->refcnt++; -#else - TextureBinding *binding = generate_texture(state, - texture_data, palette_data); -#endif glBindTexture(binding->gl_target, binding->gl_texture);