Skip to content

Commit

Permalink
macOS: Fixed deprecated warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bkaradzic
bkaradzic committed Aug 18, 2023
1 parent 0758191 commit 5f564db
Showing 1 changed file with 91 additions and 79 deletions.
170 changes: 91 additions & 79 deletions src/renderer_mtl.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,8 @@ static uint32_t getEntryProperty(io_registry_entry_t _entry, CFStringRef _proper

BX_STATIC_ASSERT(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames count");

#define SHADER_FUNCTION_NAME ("xlatMtlMain")
#define SHADER_UNIFORM_NAME ("_mtl_u")
#define SHADER_FUNCTION_NAME "xlatMtlMain"
#define SHADER_UNIFORM_NAME "_mtl_u"

struct RendererContextMtl;
static RendererContextMtl* s_renderMtl;
Expand Down Expand Up @@ -1931,8 +1931,8 @@ void setDepthStencilState(uint64_t _state, uint64_t _stencil = 0)

void processArguments(
PipelineStateMtl* ps
, NSArray<MTLArgument*>* _vertexArgs
, NSArray<MTLArgument*>* _fragmentArgs
, NSArray<id<MTLBinding>>* _vertexArgs
, NSArray<id<MTLBinding>>* _fragmentArgs
)
{
ps->m_numPredefined = 0;
Expand All @@ -1945,123 +1945,135 @@ void processArguments(
;
const int8_t fragmentBit = (1 == shaderType ? kUniformFragmentBit : 0);

for (MTLArgument* arg in (shaderType == 0 ? _vertexArgs : _fragmentArgs) )
for (id<MTLBinding> arg in (shaderType == 0 ? _vertexArgs : _fragmentArgs) )
{
BX_TRACE("arg: %s type:%d", utf8String(arg.name), arg.type);

if (arg.active)
if (arg.used)

This comment has been minimized.

Sign in to view

Copy link
@cloudwu

cloudwu Sep 15, 2023 •
edited
Loading

Contributor

This line breaks our game on iOS 16.6, but it works on iOS 17 beta .

It seems that MTLArgument.active and id<MTLBinding>.used are not equivalent.

Change this line to if ((MTLArgument*)arg).active) may fix our issue.
{
if (arg.type == MTLArgumentTypeBuffer
&& 0 == bx::strCmp(utf8String(arg.name), SHADER_UNIFORM_NAME) )
if (arg.type == MTLBindingTypeBuffer)
{
BX_ASSERT(arg.index == 0, "Uniform buffer must be in the buffer slot 0.");
BX_ASSERT(MTLDataTypeStruct == arg.bufferDataType, "%s's type must be a struct",SHADER_UNIFORM_NAME );
const id<MTLBufferBinding> binding = (id<MTLBufferBinding>)arg;

if (MTLDataTypeStruct == arg.bufferDataType)
if (0 == bx::strCmp(utf8String(arg.name), SHADER_UNIFORM_NAME) )
{
if (shaderType == 0)
{
ps->m_vshConstantBufferSize = uint32_t(arg.bufferDataSize);
ps->m_vshConstantBufferAlignment = uint32_t(arg.bufferAlignment);
}
else
{
ps->m_fshConstantBufferSize = uint32_t(arg.bufferDataSize);
ps->m_fshConstantBufferAlignment = uint32_t(arg.bufferAlignment);
}

for (MTLStructMember* uniform in arg.bufferStructType.members )
{
const char* name = utf8String(uniform.name);
BX_TRACE("uniform: %s type:%d", name, uniform.dataType);
BX_ASSERT(arg.index == 0, "Uniform buffer must be in the buffer slot 0.");

MTLDataType dataType = uniform.dataType;
uint32_t num = 1;
BX_ASSERT(
MTLDataTypeStruct == binding.bufferDataType
, SHADER_UNIFORM_NAME "'s type must be a struct"
);

if (dataType == MTLDataTypeArray)
if (MTLDataTypeStruct == binding.bufferDataType)
{
if (shaderType == 0)
{
dataType = uniform.arrayType.elementType;
num = (uint32_t)uniform.arrayType.arrayLength;
ps->m_vshConstantBufferSize = uint32_t(binding.bufferDataSize);
ps->m_vshConstantBufferAlignment = uint32_t(binding.bufferAlignment);
}
else
{
ps->m_fshConstantBufferSize = uint32_t(binding.bufferDataSize);
ps->m_fshConstantBufferAlignment = uint32_t(binding.bufferAlignment);
}

switch (dataType)
for (MTLStructMember* uniform in binding.bufferStructType.members )
{
const char* name = utf8String(uniform.name);
BX_TRACE("uniform: %s type:%d", name, uniform.dataType);

MTLDataType dataType = uniform.dataType;
uint32_t num = 1;

if (dataType == MTLDataTypeArray)
{
dataType = uniform.arrayType.elementType;
num = (uint32_t)uniform.arrayType.arrayLength;
}

switch (dataType)
{
case MTLDataTypeFloat4: num *= 1; break;
case MTLDataTypeFloat4x4: num *= 4; break;
case MTLDataTypeFloat3x3: num *= 3; break;

default:
BX_WARN(0, "Unsupported uniform MTLDataType: %d", uniform.dataType);
break;
}
}

const PredefinedUniform::Enum predefined = nameToPredefinedUniformEnum(name);
const PredefinedUniform::Enum predefined = nameToPredefinedUniformEnum(name);

if (PredefinedUniform::Count != predefined)
{
ps->m_predefined[ps->m_numPredefined].m_loc = uint32_t(uniform.offset);
ps->m_predefined[ps->m_numPredefined].m_count = uint16_t(num);
ps->m_predefined[ps->m_numPredefined].m_type = uint8_t(predefined|fragmentBit);
++ps->m_numPredefined;
}
else
{
const UniformRegInfo* info = s_renderMtl->m_uniformReg.find(name);
BX_WARN(NULL != info, "User defined uniform '%s' is not found, it won't be set.", name);

if (NULL != info)
if (PredefinedUniform::Count != predefined)
{
if (NULL == constantBuffer)
ps->m_predefined[ps->m_numPredefined].m_loc = uint32_t(uniform.offset);
ps->m_predefined[ps->m_numPredefined].m_count = uint16_t(num);
ps->m_predefined[ps->m_numPredefined].m_type = uint8_t(predefined|fragmentBit);
++ps->m_numPredefined;
}
else
{
const UniformRegInfo* info = s_renderMtl->m_uniformReg.find(name);
BX_WARN(NULL != info, "User defined uniform '%s' is not found, it won't be set.", name);

if (NULL != info)
{
constantBuffer = UniformBuffer::create(1024);
if (NULL == constantBuffer)
{
constantBuffer = UniformBuffer::create(1024);
}

UniformType::Enum type = convertMtlType(dataType);
constantBuffer->writeUniformHandle( (UniformType::Enum)(type|fragmentBit), uint32_t(uniform.offset), info->m_handle, uint16_t(num) );
BX_TRACE("store %s %d offset:%d", name, info->m_handle, uint32_t(uniform.offset) );
}

UniformType::Enum type = convertMtlType(dataType);
constantBuffer->writeUniformHandle( (UniformType::Enum)(type|fragmentBit), uint32_t(uniform.offset), info->m_handle, uint16_t(num) );
BX_TRACE("store %s %d offset:%d", name, info->m_handle, uint32_t(uniform.offset) );
}
}
}
}
else if (arg.index > 0
&& NULL != binding.bufferStructType)
{
const char* name = utf8String(arg.name);
BX_UNUSED(name);

if (arg.index >= BGFX_CONFIG_MAX_TEXTURE_SAMPLERS)
{
BX_TRACE(
"Binding index is too large %d max is %d. "
"User defined uniform '%s' won't be set."
, int32_t(arg.index - 1)
, BGFX_CONFIG_MAX_TEXTURE_SAMPLERS - 1
, name
);
}
else
{
ps->m_bindingTypes[arg.index-1] = fragmentBit
? PipelineStateMtl::BindToFragmentShader
: PipelineStateMtl::BindToVertexShader
;
BX_TRACE("Buffer %s index: %d", name, int32_t(arg.index-1) );
}
}
}
else if (arg.type == MTLArgumentTypeBuffer
&& arg.index > 0
&& NULL != arg.bufferStructType)
else if (arg.type == MTLBindingTypeTexture)
{
const char* name = utf8String(arg.name);
BX_UNUSED(name);

if (arg.index >= BGFX_CONFIG_MAX_TEXTURE_SAMPLERS)
{
BX_TRACE(
"Binding index is too large %d max is %d. "
"User defined uniform '%s' won't be set."
, int32_t(arg.index - 1)
, BGFX_CONFIG_MAX_TEXTURE_SAMPLERS - 1
, name
);
BX_WARN(false, "Binding index is too large %d max is %d. User defined uniform '%s' won't be set.", int(arg.index), BGFX_CONFIG_MAX_TEXTURE_SAMPLERS - 1, name);
}
else
{
ps->m_bindingTypes[arg.index-1] = fragmentBit
ps->m_bindingTypes[arg.index] = fragmentBit
? PipelineStateMtl::BindToFragmentShader
: PipelineStateMtl::BindToVertexShader
;
BX_TRACE("Buffer %s index: %d", name, int32_t(arg.index-1) );
}
}
else if (arg.type == MTLArgumentTypeTexture)
{
const char* name = utf8String(arg.name);

if (arg.index >= BGFX_CONFIG_MAX_TEXTURE_SAMPLERS)
{
BX_WARN(false, "Binding index is too large %d max is %d. User defined uniform '%s' won't be set.", int(arg.index), BGFX_CONFIG_MAX_TEXTURE_SAMPLERS - 1, name);
}
else
{
ps->m_bindingTypes[arg.index] = fragmentBit ? PipelineStateMtl::BindToFragmentShader : PipelineStateMtl::BindToVertexShader;
const UniformRegInfo* info = s_renderMtl->m_uniformReg.find(name);

if (info)
{
BX_TRACE("texture %s %d index:%d", name, info->m_handle, uint32_t(arg.index) );
Expand All @@ -2072,7 +2084,7 @@ void processArguments(
}
}
}
else if (arg.type == MTLArgumentTypeSampler)
else if (arg.type == MTLBindingTypeSampler)
{
BX_TRACE("sampler: %s index:%d", utf8String(arg.name), arg.index);
}
Expand Down

0 comments on commit 5f564db

Please sign in to comment.