Unity-Technologies
/
bgfx
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixed build.

This commit is contained in:
Branimir Karadžić 2017-10-01 22:52:26 -07:00
Родитель 88e8009b55
Коммит 2650897f06
4 изменённых файлов: 36 добавлений и 36 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

52
tools/shaderc/shaderc.cpp
Просмотреть файл

@ -393,9 +393,9 @@ namespace bgfx
replace[len] = '\0';
BX_CHECK(len >= bx::strLen(_replace), "");
for (const char* ptr = bx::strFind(_str, INT32_MAX, _find)
for (const char* ptr = bx::strFind(_str, _find)
; NULL != ptr
; ptr = bx::strFind(ptr + len, INT32_MAX, _find)
; ptr = bx::strFind(ptr + len, _find)
)
{
bx::memCopy(const_cast<char*>(ptr), replace, len);
@ -534,9 +534,9 @@ namespace bgfx
{
char* start = scratch(_includeDir);
for (char* split = const_cast<char*>(bx::strFind(start, INT32_MAX, ';') )
for (char* split = const_cast<char*>(bx::strFind(start, ';') )
; NULL != split
; split = const_cast<char*>(bx::strFind(start, INT32_MAX, ';') )
; split = const_cast<char*>(bx::strFind(start, ';') )
)
{
*split = '\0';
@ -713,7 +713,7 @@ namespace bgfx
bx::FilePath fp(_filePath);
char tmp[bx::kMaxFilePath];
bx::strCopy(tmp, BX_COUNTOF(tmp), fp.getFileName() );
const char* base = bx::strFind(_filePath, INT32_MAX, tmp);
const char* base = bx::strFind(_filePath, tmp);
return base;
}
@ -954,7 +954,7 @@ namespace bgfx
&& '\0' != *defines)
{
defines = bx::strws(defines);
const char* eol = bx::strFind(defines, INT32_MAX, ';');
const char* eol = bx::strFind(defines, ';');
if (NULL == eol)
{
eol = defines + bx::strLen(defines);
@ -1090,7 +1090,7 @@ namespace bgfx
&& *parse != '\0')
{
parse = bx::strws(parse);
const char* eol = bx::strFind(parse, INT32_MAX, ';');
const char* eol = bx::strFind(parse, ';');
if (NULL == eol)
{
eol = bx::streol(parse);
@ -1220,14 +1220,14 @@ namespace bgfx
if (0 == bx::strCmp(str, "input", 5) )
{
str += 5;
const char* comment = bx::strFind(str, INT32_MAX, "//");
const char* comment = bx::strFind(str, "//");
eol = NULL != comment && comment < eol ? comment : eol;
inputHash = parseInOut(shaderInputs, str, eol);
}
else if (0 == bx::strCmp(str, "output", 6) )
{
str += 6;
const char* comment = bx::strFind(str, INT32_MAX, "//");
const char* comment = bx::strFind(str, "//");
eol = NULL != comment && comment < eol ? comment : eol;
outputHash = parseInOut(shaderOutputs, str, eol);
}
@ -1301,7 +1301,7 @@ namespace bgfx
}
else if ('c' == shaderType) // Compute
{
char* entry = const_cast<char*>(bx::strFind(input, INT32_MAX, "void main()") );
char* entry = const_cast<char*>(bx::strFind(input, "void main()") );
if (NULL == entry)
{
fprintf(stderr, "Shader entry point 'void main()' is not found.\n");
@ -1340,10 +1340,10 @@ namespace bgfx
uint32_t arg = 0;
const bool hasLocalInvocationID = NULL != bx::strFind(input, INT32_MAX, "gl_LocalInvocationID");
const bool hasLocalInvocationIndex = NULL != bx::strFind(input, INT32_MAX, "gl_LocalInvocationIndex");
const bool hasGlobalInvocationID = NULL != bx::strFind(input, INT32_MAX, "gl_GlobalInvocationID");
const bool hasWorkGroupID = NULL != bx::strFind(input, INT32_MAX, "gl_WorkGroupID");
const bool hasLocalInvocationID = NULL != bx::strFind(input, "gl_LocalInvocationID");
const bool hasLocalInvocationIndex = NULL != bx::strFind(input, "gl_LocalInvocationIndex");
const bool hasGlobalInvocationID = NULL != bx::strFind(input, "gl_GlobalInvocationID");
const bool hasWorkGroupID = NULL != bx::strFind(input, "gl_WorkGroupID");
if (hasLocalInvocationID)
{
@ -1488,7 +1488,7 @@ namespace bgfx
}
else // Vertex/Fragment
{
char* entry = const_cast<char*>(bx::strFind(input, INT32_MAX, "void main()") );
char* entry = const_cast<char*>(bx::strFind(input, "void main()") );
if (NULL == entry)
{
fprintf(stderr, "Shader entry point 'void main()' is not found.\n");
@ -1588,17 +1588,17 @@ namespace bgfx
if ('f' == shaderType)
{
const char* insert = bx::strFind(entry, INT32_MAX, "{");
const char* insert = bx::strFind(entry, "{");
if (NULL != insert)
{
insert = strInsert(const_cast<char*>(insert+1), "\nvec4 bgfx_VoidFrag = vec4_splat(0.0);\n");
}
const bool hasFragColor = NULL != bx::strFind(input, INT32_MAX, "gl_FragColor");
const bool hasFragCoord = NULL != bx::strFind(input, INT32_MAX, "gl_FragCoord") || hlsl > 3 || hlsl == 2;
const bool hasFragDepth = NULL != bx::strFind(input, INT32_MAX, "gl_FragDepth");
const bool hasFrontFacing = NULL != bx::strFind(input, INT32_MAX, "gl_FrontFacing");
const bool hasPrimitiveId = NULL != bx::strFind(input, INT32_MAX, "gl_PrimitiveID");
const bool hasFragColor = NULL != bx::strFind(input, "gl_FragColor");
const bool hasFragCoord = NULL != bx::strFind(input, "gl_FragCoord") || hlsl > 3 || hlsl == 2;
const bool hasFragDepth = NULL != bx::strFind(input, "gl_FragDepth");
const bool hasFrontFacing = NULL != bx::strFind(input, "gl_FrontFacing");
const bool hasPrimitiveId = NULL != bx::strFind(input, "gl_PrimitiveID");
bool hasFragData[8] = {};
uint32_t numFragData = 0;
@ -1606,7 +1606,7 @@ namespace bgfx
{
char temp[32];
bx::snprintf(temp, BX_COUNTOF(temp), "gl_FragData[%d]", ii);
hasFragData[ii] = NULL != bx::strFind(input, INT32_MAX, temp);
hasFragData[ii] = NULL != bx::strFind(input, temp);
numFragData += hasFragData[ii];
}
@ -1728,10 +1728,10 @@ namespace bgfx
}
else if ('v' == shaderType)
{
const bool hasVertexId = NULL != bx::strFind(input, INT32_MAX, "gl_VertexID");
const bool hasInstanceId = NULL != bx::strFind(input, INT32_MAX, "gl_InstanceID");
const bool hasVertexId = NULL != bx::strFind(input, "gl_VertexID");
const bool hasInstanceId = NULL != bx::strFind(input, "gl_InstanceID");
const char* brace = bx::strFind(entry, INT32_MAX, "{");
const char* brace = bx::strFind(entry, "{");
if (NULL != brace)
{
const char* end = bx::strmb(brace, '{', '}');
@ -1930,7 +1930,7 @@ namespace bgfx
|| !!bx::findIdentifierMatch(input, s_ARB_shader_texture_lod)
|| !!bx::findIdentifierMatch(input, s_EXT_shader_texture_lod)
;
const bool usesInstanceID = !!bx::strFind(input, INT32_MAX, "gl_InstanceID");
const bool usesInstanceID = !!bx::strFind(input, "gl_InstanceID");
const bool usesGpuShader4 = !!bx::findIdentifierMatch(input, s_EXT_gpu_shader4);
const bool usesGpuShader5 = !!bx::findIdentifierMatch(input, s_ARB_gpu_shader5);
const bool usesTexelFetch = !!bx::findIdentifierMatch(input, s_texelFetch);

16
tools/shaderc/shaderc_glsl.cpp
Просмотреть файл

@ -109,7 +109,7 @@ namespace bgfx { namespace glsl
&& *parse != '\0')
{
parse = bx::strws(parse);
const char* eol = bx::strFind(parse, INT32_MAX, ';');
const char* eol = bx::strFind(parse, ';');
if (NULL != eol)
{
const char* qualifier = parse;
@ -169,13 +169,13 @@ namespace bgfx { namespace glsl
char uniformName[256];
uint8_t num = 1;
const char* array = bx::strFind(name, int32_t(eol-parse), "[");
const char* array = bx::strFind(bx::StringView(name, int32_t(eol-parse) ), "[");
if (NULL != array)
{
bx::strCopy(uniformName, int32_t(array-name+1), name);
char arraySize[32];
const char* end = bx::strFind(array, int32_t(eol-array), "]");
const char* end = bx::strFind(bx::StringView(array, int32_t(eol-array) ), "]");
bx::strCopy(arraySize, int32_t(end-array), array+1);
num = uint8_t(atoi(arraySize) );
}
@ -204,19 +204,19 @@ namespace bgfx { namespace glsl
}
else
{
const char* parse = bx::strFind(optimizedShader, INT32_MAX, "struct xlatMtlShaderUniform {");
const char* parse = bx::strFind(optimizedShader, "struct xlatMtlShaderUniform {");
const char* end = parse;
if (NULL != parse)
{
parse += bx::strLen("struct xlatMtlShaderUniform {");
end = bx::strFind(parse, INT32_MAX, "};");
end = bx::strFind(parse, "};");
}
while ( parse < end
&& *parse != '\0')
{
parse = bx::strws(parse);
const char* eol = bx::strFind(parse, INT32_MAX, ';');
const char* eol = bx::strFind(parse, ';');
if (NULL != eol)
{
const char* typen = parse;
@ -228,13 +228,13 @@ namespace bgfx { namespace glsl
char uniformName[256];
uint8_t num = 1;
const char* array = bx::strFind(name, int32_t(eol-parse), "[");
const char* array = bx::strFind(bx::StringView(name, int32_t(eol-parse) ), "[");
if (NULL != array)
{
bx::strCopy(uniformName, int32_t(array-name+1), name);
char arraySize[32];
const char* arrayEnd = bx::strFind(array, int32_t(eol-array), "]");
const char* arrayEnd = bx::strFind(bx::StringView(array, int32_t(eol-array) ), "]");
bx::strCopy(arraySize, int32_t(arrayEnd-array), array+1);
num = uint8_t(atoi(arraySize) );
}

2
tools/shaderc/shaderc_hlsl.cpp
Просмотреть файл

@ -522,7 +522,7 @@ namespace bgfx { namespace hlsl
, bindDesc.BindCount
);
const char * end = bx::strFind(bindDesc.Name, INT32_MAX, "Sampler");
const char * end = bx::strFind(bindDesc.Name, "Sampler");
if (NULL != end)
{
Uniform un;

2
tools/shaderc/shaderc_spirv.cpp
Просмотреть файл

@ -602,7 +602,7 @@ namespace bgfx { namespace spirv
int32_t start = 0;
int32_t end = INT32_MAX;
const char* err = bx::strFind(log, INT32_MAX, "ERROR:");
const char* err = bx::strFind(log, "ERROR:");
bool found = false;