From 3f03e84d45369172739f7ac7a3731921ff530d30 Mon Sep 17 00:00:00 2001 From: James Benton Date: Sun, 9 Oct 2016 21:01:52 +0100 Subject: [PATCH] gx2: Remove duplicated GX2RResourceFlags enum. --- include/gx2/enum.h | 25 ------------------------- include/gx2/surface.h | 7 +------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/include/gx2/enum.h b/include/gx2/enum.h index fa1b21b..7a63180 100644 --- a/include/gx2/enum.h +++ b/include/gx2/enum.h @@ -248,31 +248,6 @@ typedef enum GX2RoundingMode GX2_ROUNDING_MODE_TRUNCATE = 1, } GX2RoundingMode; -typedef enum GX2RResourceFlags -{ - GX2R_RESOURCE_FLAGS_BIND_TEXTURE = 1 << 0, - GX2R_RESOURCE_FLAGS_BIND_COLOR_BUFFER = 1 << 1, - GX2R_RESOURCE_FLAGS_BIND_DEPTH_BUFFER = 1 << 2, - GX2R_RESOURCE_FLAGS_BIND_SCAN_BUFFER = 1 << 3, - GX2R_RESOURCE_FLAGS_BIND_VERTEX_BUFFER = 1 << 4, - GX2R_RESOURCE_FLAGS_BIND_INDEX_BUFFER = 1 << 5, - GX2R_RESOURCE_FLAGS_BIND_UNIFORM_BLOCK = 1 << 6, - GX2R_RESOURCE_FLAGS_BIND_SHADER_PROGRAM = 1 << 7, - GX2R_RESOURCE_FLAGS_BIND_STREAM_OUTPUT = 1 << 8, - GX2R_RESOURCE_FLAGS_BIND_DISPLAY_LIST = 1 << 9, - GX2R_RESOURCE_FLAGS_BIND_GS_RING = 1 << 10, - GX2R_RESOURCE_FLAGS_USAGE_CPU_READ = 1 << 11, - GX2R_RESOURCE_FLAGS_USAGE_CPU_WRITE = 1 << 12, - GX2R_RESOURCE_FLAGS_USAGE_GPU_READ = 1 << 13, - GX2R_RESOURCE_FLAGS_USAGE_GPU_WRITE = 1 << 14, - GX2R_RESOURCE_FLAGS_USAGE_DMA_READ = 1 << 15, - GX2R_RESOURCE_FLAGS_USAGE_DMA_WRITE = 1 << 16, - GX2R_RESOURCE_FLAGS_USAGE_FORCE_MEM1 = 1 << 17, - GX2R_RESOURCE_FLAGS_USAGE_FORCE_MEM2 = 1 << 18, - GX2R_RESOURCE_FLAGS_USER_MEMORY = 1 << 29, - GX2R_RESOURCE_FLAGS_LOCKED = 1 << 30, -} GX2RResourceFlags; - typedef enum GX2SamplerVarType { GX2_SAMPLER_VAR_TYPE_SAMPLER_1D = 0, diff --git a/include/gx2/surface.h b/include/gx2/surface.h index b7c50ed..815ea3b 100644 --- a/include/gx2/surface.h +++ b/include/gx2/surface.h @@ -25,11 +25,7 @@ struct GX2Surface uint32_t mipLevels; GX2SurfaceFormat format; GX2AAMode aa; - union - { - GX2SurfaceUse use; - GX2RResourceFlags resourceFlags; - }; + GX2SurfaceUse use; uint32_t imageSize; void *image; uint32_t mipmapSize; @@ -48,7 +44,6 @@ CHECK_OFFSET(GX2Surface, 0x10, mipLevels); CHECK_OFFSET(GX2Surface, 0x14, format); CHECK_OFFSET(GX2Surface, 0x18, aa); CHECK_OFFSET(GX2Surface, 0x1c, use); -CHECK_OFFSET(GX2Surface, 0x1c, resourceFlags); CHECK_OFFSET(GX2Surface, 0x20, imageSize); CHECK_OFFSET(GX2Surface, 0x24, image); CHECK_OFFSET(GX2Surface, 0x28, mipmapSize);