Skip to content

Commit e045f73

Browse files
vtfpp: ok actual flag name consistency this time
1 parent 7f67890 commit e045f73

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎include/vtfpp/VTF.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,12 @@ class VTF {
172172
FLAG_V0_NORMAL = 1u << 7,
173173
FLAG_V0_NO_MIP = 1u << 8, // Controlled by mip count
174174
FLAG_V0_NO_LOD = 1u << 9,
175-
FLAG_V0_MIN_MIP = 1u << 10,
175+
FLAG_V0_LOAD_SMALL_MIPS = 1u << 10,
176176
FLAG_V0_PROCEDURAL = 1u << 11,
177177
FLAG_V0_ONE_BIT_ALPHA = 1u << 12,
178178
FLAG_V0_MULTI_BIT_ALPHA = 1u << 13,
179179
FLAG_V0_ENVMAP = 1u << 14, // Controlled by face count
180-
FLAG_MASK_V0 = FLAG_V0_POINT_SAMPLE | FLAG_V0_TRILINEAR | FLAG_V0_CLAMP_S | FLAG_V0_CLAMP_T | FLAG_V0_ANISOTROPIC | FLAG_V0_VTEX_HINT_DXT5 | FLAG_V0_VTEX_NO_COMPRESS | FLAG_V0_NORMAL | FLAG_V0_NO_MIP | FLAG_V0_NO_LOD | FLAG_V0_MIN_MIP | FLAG_V0_PROCEDURAL | FLAG_V0_ONE_BIT_ALPHA | FLAG_V0_MULTI_BIT_ALPHA | FLAG_V0_ENVMAP,
180+
FLAG_MASK_V0 = FLAG_V0_POINT_SAMPLE | FLAG_V0_TRILINEAR | FLAG_V0_CLAMP_S | FLAG_V0_CLAMP_T | FLAG_V0_ANISOTROPIC | FLAG_V0_VTEX_HINT_DXT5 | FLAG_V0_VTEX_NO_COMPRESS | FLAG_V0_NORMAL | FLAG_V0_NO_MIP | FLAG_V0_NO_LOD | FLAG_V0_LOAD_SMALL_MIPS | FLAG_V0_PROCEDURAL | FLAG_V0_ONE_BIT_ALPHA | FLAG_V0_MULTI_BIT_ALPHA | FLAG_V0_ENVMAP,
181181
FLAG_MASK_V0_VTEX = FLAG_V0_VTEX_HINT_DXT5 | FLAG_V0_VTEX_NO_COMPRESS,
182182

183183
FLAG_V1_RENDERTARGET = 1u << 15,
@@ -203,11 +203,11 @@ class VTF {
203203
FLAG_MASK_XBOX = FLAG_XBOX_VTEX_PRESWIZZLED | FLAG_XBOX_CACHEABLE | FLAG_XBOX_UNFILTERABLE_OK,
204204
FLAG_MASK_XBOX_VTEX = FLAG_XBOX_VTEX_PRESWIZZLED,
205205

206-
FLAG_V3_ALL_MIPS = 1u << 10,
206+
FLAG_V3_LOAD_ALL_MIPS = 1u << 10,
207207
FLAG_V3_VERTEX_TEXTURE = 1u << 26,
208208
FLAG_V3_SSBUMP = 1u << 27,
209209
FLAG_V3_BORDER = 1u << 29,
210-
FLAG_MASK_V3 = FLAG_V3_ALL_MIPS | FLAG_V3_VERTEX_TEXTURE | FLAG_V3_SSBUMP | FLAG_V3_BORDER,
210+
FLAG_MASK_V3 = FLAG_V3_LOAD_ALL_MIPS | FLAG_V3_VERTEX_TEXTURE | FLAG_V3_SSBUMP | FLAG_V3_BORDER,
211211

212212
FLAG_V4_SRGB = 1u << 6,
213213
FLAG_MASK_V4 = FLAG_V4_SRGB,
@@ -222,8 +222,8 @@ class VTF {
222222
FLAG_V5_PWL_CORRECTED = 1u << 6,
223223
FLAG_V5_SRGB = 1u << 19,
224224
FLAG_V5_DEFAULT_POOL = 1u << 20,
225-
FLAG_V5_MOST_MIPS = 1u << 28,
226-
FLAG_MASK_V5 = FLAG_V5_PWL_CORRECTED | FLAG_V5_SRGB | FLAG_V5_DEFAULT_POOL | FLAG_V5_MOST_MIPS,
225+
FLAG_V5_LOAD_MOST_MIPS = 1u << 28,
226+
FLAG_MASK_V5 = FLAG_V5_PWL_CORRECTED | FLAG_V5_SRGB | FLAG_V5_DEFAULT_POOL | FLAG_V5_LOAD_MOST_MIPS,
227227

228228
FLAG_V5_CSGO_COMBINED = 1u << 21,
229229
FLAG_V5_CSGO_ASYNC_DOWNLOAD = 1u << 22,

‎lang/python/src/vtfpp.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ inline void register_python(py::module_& m) {
436436
.value("V0_NORMAL", VTF::FLAG_V0_NORMAL)
437437
.value("V0_NO_MIP", VTF::FLAG_V0_NO_MIP)
438438
.value("V0_NO_LOD", VTF::FLAG_V0_NO_LOD)
439-
.value("V0_MIN_MIP", VTF::FLAG_V0_MIN_MIP)
439+
.value("V0_LOAD_SMALL_MIPS", VTF::FLAG_V0_LOAD_SMALL_MIPS)
440440
.value("V0_PROCEDURAL", VTF::FLAG_V0_PROCEDURAL)
441441
.value("V0_ONE_BIT_ALPHA", VTF::FLAG_V0_ONE_BIT_ALPHA)
442442
.value("V0_MULTI_BIT_ALPHA", VTF::FLAG_V0_MULTI_BIT_ALPHA)
@@ -463,7 +463,7 @@ inline void register_python(py::module_& m) {
463463
.value("XBOX_UNFILTERABLE_OK", VTF::FLAG_XBOX_UNFILTERABLE_OK)
464464
.value("MASK_XBOX", VTF::FLAG_MASK_XBOX)
465465
.value("MASK_XBOX_VTEX", VTF::FLAG_MASK_XBOX_VTEX)
466-
.value("V3_ALL_MIPS", VTF::FLAG_V3_ALL_MIPS)
466+
.value("V3_LOAD_ALL_MIPS", VTF::FLAG_V3_LOAD_ALL_MIPS)
467467
.value("V3_VERTEX_TEXTURE", VTF::FLAG_V3_VERTEX_TEXTURE)
468468
.value("V3_SSBUMP", VTF::FLAG_V3_SSBUMP)
469469
.value("V3_BORDER", VTF::FLAG_V3_BORDER)
@@ -479,7 +479,7 @@ inline void register_python(py::module_& m) {
479479
.value("V5_PWL_CORRECTED", VTF::FLAG_V5_PWL_CORRECTED)
480480
.value("V5_SRGB", VTF::FLAG_V5_SRGB)
481481
.value("V5_DEFAULT_POOL", VTF::FLAG_V5_DEFAULT_POOL)
482-
.value("V5_MOST_MIPS", VTF::FLAG_V5_MOST_MIPS)
482+
.value("V5_LOAD_MOST_MIPS", VTF::FLAG_V5_LOAD_MOST_MIPS)
483483
.value("MASK_V5", VTF::FLAG_MASK_V5)
484484
.value("V5_CSGO_COMBINED", VTF::FLAG_V5_CSGO_COMBINED)
485485
.value("V5_CSGO_ASYNC_DOWNLOAD", VTF::FLAG_V5_CSGO_ASYNC_DOWNLOAD)

0 commit comments

Comments
 (0)