Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-18 04:53:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

shaderc: Parse in/out correctly.

Browse Source
This commit is contained in:
Branimir Karadžić
2017-04-03 17:53:14 -07:00
parent f48540040d
commit 8b94c13e32
4 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/common/imgui/imgui.cpp
View File

@@ -99,6 +99,7 @@ void imguiFree(void* _ptr, void*);
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4505); // error C4505: '' : unreferenced local function has been removed
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-function"); // warning: ‘int rect_width_compare(const void*, const void*)’ defined but not used
BX_PRAGMA_DIAGNOSTIC_PUSH();
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG("-Wunknown-pragmas")
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-but-set-variable"); // warning: variable ‘L1’ set but not used
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wtype-limits"); // warning: comparison is always true due to limited range of data type
#define STBTT_malloc(_size, _userData) imguiMalloc(_size, _userData)

8
examples/common/nanovg/nanovg.cpp
View File

@@ -23,6 +23,10 @@
#include "nanovg.h"
#ifndef NANOVG_HAS_STB_IMAGE
# define NANOVG_HAS_STB_IMAGE 1
#endif // NANOVG_HAS_STB_IMAGE
#include <bx/macros.h>
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4701) // error C4701: potentially uninitialized local variable 'cint' used
@@ -37,6 +41,7 @@ BX_PRAGMA_DIAGNOSTIC_IGNORED_GCC("-Wunused-result");
#include "fontstash.h"
BX_PRAGMA_DIAGNOSTIC_POP();
#if NANOVG_HAS_STB_IMAGE
#define LODEPNG_NO_COMPILE_ENCODER
#define LODEPNG_NO_COMPILE_DISK
#define LODEPNG_NO_COMPILE_ANCILLARY_CHUNKS
@@ -56,6 +61,7 @@ BX_PRAGMA_DIAGNOSTIC_IGNORED_GCC("-Wshift-negative-value");
#include <stb/stb_image.c>
BX_PRAGMA_DIAGNOSTIC_POP();
#endif // NANOVG_HAS_STB_IMAGE
#ifdef _MSC_VER
#pragma warning(disable: 4100) // unreferenced formal parameter
@@ -810,6 +816,7 @@ void nvgFillPaint(NVGcontext* ctx, NVGpaint paint)
nvgTransformMultiply(state->fill.xform, state->xform);
}
#if NANOVG_HAS_STB_IMAGE
int nvgCreateImage(NVGcontext* ctx, const char* filename, int imageFlags)
{
int w, h, n, image;
@@ -838,6 +845,7 @@ int nvgCreateImageMem(NVGcontext* ctx, int imageFlags, unsigned char* data, int
stbi_image_free(img);
return image;
}
#endif // NANOVG_HAS_STB_IMAGE
int nvgCreateImageRGBA(NVGcontext* ctx, int w, int h, int imageFlags, const unsigned char* data)
{

4
tools/shaderc/shaderc.cpp
View File

@@ -1874,6 +1874,7 @@ namespace bgfx
else
{
bx::stringPrintf(code, "#version %s\n", need130 ? "130" : profile);
glsl = 130;
}
if (usesGpuShader5)
@@ -1895,8 +1896,7 @@ namespace bgfx
if (usesTextureLod)
{
if ( (0 != metal || 130 > glsl)
&& 'f' == shaderType)
if ('f' == shaderType)
{
ARB_shader_texture_lod = true;
bx::stringPrintf(code

52
tools/shaderc/shaderc_glsl.cpp
View File

@@ -50,6 +50,7 @@ namespace bgfx { namespace glsl
bool found = false
|| 3 == sscanf(log, "%u:%u(%u):", &source, &line, &column)
|| 2 == sscanf(log, "(%u,%u):", &line, &column)
;
if (found
@@ -108,21 +109,24 @@ namespace bgfx { namespace glsl
&& *parse != '\0')
{
parse = bx::strws(parse);
const char* eol = strchr(parse, ';');
const char* eol = bx::strnchr(parse, ';');
if (NULL != eol)
{
const char* qualifier = parse;
parse = bx::strws(bx::strword(parse) );
if (0 == strncmp(qualifier, "attribute", 9)
|| 0 == strncmp(qualifier, "varying", 7) )
if (0 == bx::strncmp(qualifier, "attribute", 9)
|| 0 == bx::strncmp(qualifier, "varying", 7)
|| 0 == bx::strncmp(qualifier, "in", 2)
|| 0 == bx::strncmp(qualifier, "out", 3)
)
{
// skip attributes and varyings.
parse = eol + 1;
continue;
}
if (0 != strncmp(qualifier, "uniform", 7) )
if (0 != bx::strncmp(qualifier, "uniform", 7) )
{
// end if there is no uniform keyword.
parse = NULL;
@@ -132,9 +136,9 @@ namespace bgfx { namespace glsl
const char* precision = NULL;
const char* typen = parse;
if (0 == strncmp(typen, "lowp", 4)
|| 0 == strncmp(typen, "mediump", 7)
|| 0 == strncmp(typen, "highp", 5) )
if (0 == bx::strncmp(typen, "lowp", 4)
|| 0 == bx::strncmp(typen, "mediump", 7)
|| 0 == bx::strncmp(typen, "highp", 5) )
{
precision = typen;
typen = parse = bx::strws(bx::strword(parse) );
@@ -147,30 +151,30 @@ namespace bgfx { namespace glsl
if (0 == strncmp(typen, "sampler", 7) )
{
strcpy(uniformType, "int");
bx::strlncpy(uniformType, BX_COUNTOF(uniformType), "int");
}
else
{
bx::strlcpy(uniformType, typen, parse-typen+1);
bx::strlcpy(uniformType, typen, int32_t(parse-typen+1) );
}
const char* name = parse = bx::strws(parse);
char uniformName[256];
uint8_t num = 1;
const char* array = bx::strnstr(name, "[", eol-parse);
const char* array = bx::strnstr(name, "[", int32_t(eol-parse) );
if (NULL != array)
{
bx::strlcpy(uniformName, name, array-name+1);
bx::strlcpy(uniformName, name, int32_t(array-name+1) );
char arraySize[32];
const char* end = bx::strnstr(array, "]", eol-array);
bx::strlcpy(arraySize, array+1, end-array);
const char* end = bx::strnstr(array, "]", int32_t(eol-array) );
bx::strlcpy(arraySize, array+1, int32_t(end-array) );
num = uint8_t(atoi(arraySize) );
}
else
{
bx::strlcpy(uniformName, name, eol-name+1);
bx::strlcpy(uniformName, name, int32_t(eol-name+1) );
}
Uniform un;
@@ -193,43 +197,43 @@ namespace bgfx { namespace glsl
}
else
{
const char* parse = strstr(optimizedShader, "struct xlatMtlShaderUniform {");
const char* parse = bx::strnstr(optimizedShader, "struct xlatMtlShaderUniform {");
const char* end = parse;
if (NULL != parse)
{
parse += strlen("struct xlatMtlShaderUniform {");
end = strstr(parse, "};");
parse += bx::strnlen("struct xlatMtlShaderUniform {");
end = bx::strnstr(parse, "};");
}
while ( parse < end
&& *parse != '\0')
{
parse = bx::strws(parse);
const char* eol = strchr(parse, ';');
const char* eol = bx::strnchr(parse, ';');
if (NULL != eol)
{
const char* typen = parse;
char uniformType[256];
parse = bx::strword(parse);
bx::strlcpy(uniformType, typen, parse-typen+1);
bx::strlcpy(uniformType, typen, int32_t(parse-typen+1) );
const char* name = parse = bx::strws(parse);
char uniformName[256];
uint8_t num = 1;
const char* array = bx::strnstr(name, "[", eol-parse);
const char* array = bx::strnstr(name, "[", int32_t(eol-parse) );
if (NULL != array)
{
bx::strlcpy(uniformName, name, array-name+1);
bx::strlcpy(uniformName, name, int32_t(array-name+1) );
char arraySize[32];
const char* arrayEnd = bx::strnstr(array, "]", eol-array);
bx::strlcpy(arraySize, array+1, arrayEnd-array);
const char* arrayEnd = bx::strnstr(array, "]", int32_t(eol-array) );
bx::strlcpy(arraySize, array+1, int32_t(arrayEnd-array) );
num = uint8_t(atoi(arraySize) );
}
else
{
bx::strlcpy(uniformName, name, eol-name+1);
bx::strlcpy(uniformName, name, int32_t(eol-name+1) );
}
Uniform un;