From 655466e2d798b72ee3d3be7fcfe32db6af2d4466 Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 29 Oct 2021 19:38:51 +0800 Subject: *rename --- Runtime/Graphics/GfxDevice.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Runtime/Graphics/GfxDevice.cpp') diff --git a/Runtime/Graphics/GfxDevice.cpp b/Runtime/Graphics/GfxDevice.cpp index d466eb9..d30a60a 100644 --- a/Runtime/Graphics/GfxDevice.cpp +++ b/Runtime/Graphics/GfxDevice.cpp @@ -4,7 +4,7 @@ static bool deviceInited = false; static const std::vector s_AvailableTextureUnitPreset = {0,1,2,3,4,5,6,7}; // 最多支持8个贴图 -static std::vector s_AvailableTextureUnit = s_AvailableTextureUnitPreset; +static std::vector s_TextureUnitBucket = s_AvailableTextureUnitPreset; GfxDevice g_GfxDevice; @@ -16,7 +16,6 @@ GfxDevice::GfxDevice() GfxDevice::~GfxDevice() { - } void GfxDevice::Initialize(GfxDeviceSetting setting) @@ -127,14 +126,14 @@ void GfxDevice::SetUniformMat4(const char* name, Internal::Matrix44 mat4) void GfxDevice::SetUniformTexture(const char* name, Texture* texture) { - if (s_AvailableTextureUnit.size() == 0) + if (s_TextureUnitBucket.size() == 0) { log_error("No available texture unit. Too many textures or forget invoke ResetUniformsState()"); return; } - int texUnit = s_AvailableTextureUnit.back(); - s_AvailableTextureUnit.pop_back(); + int texUnit = s_TextureUnitBucket.back(); + s_TextureUnitBucket.pop_back(); glActiveTexture(GL_TEXTURE0 + texUnit); glBindTexture(GL_TEXTURE_2D, texture->GetGpuID()); @@ -144,7 +143,7 @@ void GfxDevice::SetUniformTexture(const char* name, Texture* texture) void GfxDevice::ResetUniformsState() { - s_AvailableTextureUnit = s_AvailableTextureUnitPreset; + s_TextureUnitBucket = s_AvailableTextureUnitPreset; } void GfxDevice::BeginFrame() -- cgit v1.1-26-g67d0