The-Homebrew-Cloud/wut
2
0
Fork 0
mirror of https://github.com/wiiu-env/wut.git synced 2025-01-06 14:48:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gx2: Remove duplicated GX2RResourceFlags enum.

Browse Source
This commit is contained in:
James Benton 2016-10-09 21:01:52 +01:00
parent cf00f97167
commit 3f03e84d45
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/gx2/enum.h
View File

@ -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,

7
include/gx2/surface.h
View File

@ -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);