Commit d6053daa by James Darpinian Committed by Commit Bot

Remove tabs from source files.

WebKit's Subversion repo refuses to commit source files that contain tabs. Bug: angleproject:3439 Change-Id: I0a804bcfa0375a98e19945e20297c90d31106827 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1954410 Commit-Queue: James Darpinian <jdarpinian@chromium.org> Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org>
parent caa6eccd
{
"src/libANGLE/renderer/angle_format.py":
"32ba71942c0fd00e6807104f1bb80a3c",
"src/libANGLE/renderer/gen_load_functions_table.py":
"e65c50e84fc38ad34d0eb0bebb84aab6",
"9b4ea6bcb4eb4c43f48a097a9ec920f1",
"src/libANGLE/renderer/load_functions_data.json":
"5e9a50b1eeda3b5bca68aac4bc379437",
"src/libANGLE/renderer/load_functions_table_autogen.cpp":
......
{
"src/compiler/generate_parser_tools.py":
"dca7f7926758ba89a337854f615aca46",
"src/compiler/preprocessor/generate_parser.py":
"cc871de99688a35bfe32ef501f965d5a",
"src/compiler/preprocessor/preprocessor.l":
"143dec2269b9a49a9588391bb57580ec",
"31b4f8bc0bb8f713f5e4db8ae04925e2",
"src/compiler/preprocessor/preprocessor.y":
"a3a7dcbf9fd1cf1721ab635cea0189b2",
"6d9cc9961a8df3e3712f63f01f995161",
"src/compiler/preprocessor/preprocessor_lex_autogen.cpp":
"5e2dd7b0f74393db96ca6d9b0adeae0b",
"77b814881471bcb8c2720a3bc87110de",
"src/compiler/preprocessor/preprocessor_tab_autogen.cpp":
"1faa877557cf67e564cabc547aa3f3c0",
"e6f38425fe894b07a3a961a6c81b85c2",
"tools/flex-bison/linux/bison.sha1":
"efa86001f00e7bcfdbe899dd15fc88e0",
"tools/flex-bison/linux/flex.sha1":
......
{
"src/compiler/generate_parser_tools.py":
"dca7f7926758ba89a337854f615aca46",
"src/compiler/translator/generate_parser.py":
"566178ecdfae3a29803b3687fc518ebb",
"src/compiler/translator/glslang.l":
"1aaddb610e7bde7f7cffc993ba762c93",
"1cf4635ab5c00fa10592fce2569368ac",
"src/compiler/translator/glslang.y":
"2570cc8e33a11cbff3fcbe278f96e5ba",
"ffa9809b1f330df9b9e38ada6698f8a4",
"src/compiler/translator/glslang_lex_autogen.cpp":
"2958d0637093e53e1330c67cc323bbb9",
"ce633127e7674ceb14000f2654cf2637",
"src/compiler/translator/glslang_tab_autogen.cpp":
"a1c116b14fc63d802487b5d404669d93",
"ff27c679d225ba8d0a4f9f9857eda3e5",
"src/compiler/translator/glslang_tab_autogen.h":
"c33cc1947462ebb31778181a48538b6b",
"tools/flex-bison/linux/bison.sha1":
......
......@@ -4,5 +4,7 @@
"src/libANGLE/es3_copy_conversion_table_autogen.cpp":
"b20d198cf5e292c43170d4873b381b34",
"src/libANGLE/gen_copy_conversion_table.py":
"827a4a27cea1e11bef18fed9dce6dceb"
"18e0d2ff461f730a9efb0dcdfa3f058a",
"src/libANGLE/renderer/angle_format.py":
"32ba71942c0fd00e6807104f1bb80a3c"
}
\ No newline at end of file
......@@ -6,5 +6,7 @@
"src/libANGLE/format_map_data.json":
"2dd1986f49c441ad9a71b82410f57d6e",
"src/libANGLE/gen_format_map.py":
"dbc855d50826670a9e1a4ff2747e7583"
"38320d844e6629e09afc5ccdc484e9aa",
"src/libANGLE/renderer/angle_format.py":
"32ba71942c0fd00e6807104f1bb80a3c"
}
\ No newline at end of file
{
"src/libANGLE/renderer/angle_format.py":
"32ba71942c0fd00e6807104f1bb80a3c",
"src/libANGLE/renderer/metal/gen_mtl_format_table.py":
"afa19b351ae9615be0ec962790d81bd3",
"b6468446dd1da3e44ac9dd11690b5bf1",
"src/libANGLE/renderer/metal/mtl_format_map.json":
"c6f5b6dda11e456cfbcaeec53eb46fa0",
"src/libANGLE/renderer/metal/mtl_format_table_autogen.mm":
......
......@@ -90,6 +90,10 @@ def run_flex(basename):
patched = output.replace(patch_in, patch_out)
# Remove all tab characters from output. WebKit does not allow any tab characters in source
# files.
patched = patched.replace('\t', ' ')
with open(output_source, 'w') as flex_output_patched:
flex_output_patched.write(patched)
......@@ -134,6 +138,10 @@ def generate_parser(basename, generate_header):
if sys.argv[1] == 'inputs':
inputs = get_tool_file_sha1s()
inputs += get_input_files(basename)
current_file = __file__
if current_file.endswith('.pyc'):
current_file = current_file[:-1]
inputs += [current_file]
print(','.join(inputs))
if sys.argv[1] == 'outputs':
print(','.join(get_output_files(basename, generate_header)))
......
......@@ -23,7 +23,6 @@ IF YOU MODIFY THIS FILE YOU ALSO NEED TO RUN scripts/run_code_generation.py
// preprocessor.l:
// Lexer for the OpenGL shading language preprocessor.
// clang-format off
}
%{
......
......@@ -22,8 +22,6 @@ WHICH GENERATES THE GLSL ES preprocessor expression parser.
// preprocessor.y:
// Parser for the OpenGL shading language preprocessor.
// clang-format off
#if defined(__GNUC__)
// Triggered by the auto-generated pplval variable.
#if !defined(__clang__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -24,8 +24,6 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex_autogen.cpp).
// glslang.l:
// Lexer for the OpenGL shading language.
// clang-format off
// Ignore errors in auto-generated code.
#if defined(__GNUC__)
#pragma GCC diagnostic ignored "-Wswitch-enum"
......@@ -251,7 +249,7 @@ O [0-7]
"iimage3D" { return ES3_reserved_ES3_1_keyword(context, IIMAGE3D); }
"iimageCube" { return ES3_reserved_ES3_1_keyword(context, IIMAGECUBE); }
"uimageCube" { return ES3_reserved_ES3_1_keyword(context, UIMAGECUBE); }
"imageCube" { return ES3_reserved_ES3_1_keyword(context, IMAGECUBE); }
"imageCube" { return ES3_reserved_ES3_1_keyword(context, IMAGECUBE); }
"readonly" { return ES3_reserved_ES3_1_keyword(context, READONLY); }
"writeonly" { return ES3_reserved_ES3_1_keyword(context, WRITEONLY); }
"coherent" { return ES3_reserved_ES3_1_keyword(context, COHERENT); }
......
......@@ -24,8 +24,6 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab_autogen.cpp AND glslang_tab_auto
// glslang.y:
// Parser for the OpenGL shading language.
// clang-format off
// Ignore errors in auto-generated code.
#if defined(__GNUC__)
#pragma GCC diagnostic ignored "-Wunused-function"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -74,7 +74,7 @@ def main():
# auto_script parameters.
if len(sys.argv) > 1:
inputs = [data_source_name]
inputs = ['renderer/angle_format.py', data_source_name]
outputs = [out_file_name]
if sys.argv[1] == 'inputs':
......
......@@ -127,7 +127,9 @@ def main():
# auto_script parameters.
if len(sys.argv) > 1:
inputs = ['es3_format_type_combinations.json', 'format_map_data.json']
inputs = [
'renderer/angle_format.py', 'es3_format_type_combinations.json', 'format_map_data.json'
]
outputs = ['format_map_autogen.cpp']
if sys.argv[1] == 'inputs':
......
......@@ -198,7 +198,7 @@ def main():
# auto_script parameters.
if len(sys.argv) > 1:
inputs = ['load_functions_data.json']
inputs = ['angle_format.py', 'load_functions_data.json']
outputs = ['load_functions_table_autogen.cpp']
if sys.argv[1] == 'inputs':
......
......@@ -265,7 +265,7 @@ def gen_vertex_map_switch_string(vertex_table):
def main():
# auto_script parameters.
if len(sys.argv) > 1:
inputs = ['mtl_format_map.json']
inputs = ['../angle_format.py', 'mtl_format_map.json']
outputs = ['mtl_format_table_autogen.mm']
if sys.argv[1] == 'inputs':
......
......@@ -429,7 +429,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersInvariant)
"}\n"
"void main()\n"
"{\n"
" gl_FragColor = vec4(foo0(value));\n"
" gl_FragColor = vec4(foo0(value));\n"
"}\n";
if (compile(shaderString))
......@@ -449,7 +449,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersAttribute)
"}\n"
"void main()\n"
"{\n"
" gl_FragColor = vec4(foo0(value));\n"
" gl_FragColor = vec4(foo0(value));\n"
"}\n";
if (compile(shaderString))
......@@ -469,7 +469,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersVarying)
"}\n"
"void main()\n"
"{\n"
" gl_FragColor = vec4(foo0(value));\n"
" gl_FragColor = vec4(foo0(value));\n"
"}\n";
if (compile(shaderString))
......@@ -491,7 +491,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersLayout)
"out vec4 colorOUT;\n"
"void main()\n"
"{\n"
" colorOUT = vec4(foo0(value));\n"
" colorOUT = vec4(foo0(value));\n"
"}\n";
if (compile(shaderString))
......@@ -513,7 +513,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersCentroidIn
"out vec4 colorOUT;\n"
"void main()\n"
"{\n"
" colorOUT = vec4(foo0(value));\n"
" colorOUT = vec4(foo0(value));\n"
"}\n";
if (compile(shaderString))
......@@ -535,7 +535,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersFlatIn)
"out vec4 colorOUT;\n"
"void main()\n"
"{\n"
" colorOUT = vec4(foo0(value));\n"
" colorOUT = vec4(foo0(value));\n"
"}\n";
if (compile(shaderString))
......
......@@ -425,7 +425,7 @@ void ShaderConstExprTests::init(void)
{"min", "min(${T} (12.3), ${MT} (32.1))", glu::TYPE_FLOAT, 1, 4, glu::TYPE_FLOAT, {12.3f}},
{"max", "max(${T} (12.3), ${MT} (32.1))", glu::TYPE_FLOAT, 1, 4, glu::TYPE_FLOAT, {32.1f}},
{"clamp",
"clamp(${T} (42.1), ${MT} (10.0), ${MT} (15.0))",
"clamp(${T} (42.1), ${MT} (10.0), ${MT} (15.0))",
glu::TYPE_FLOAT,
1,
4,
......@@ -559,7 +559,7 @@ void ShaderConstExprTests::init(void)
glu::TYPE_INT,
{deFloatMax(2.3f, 3.1f)}},
{"clamp",
"clamp(${T} (4.1), ${MT} (2.1), ${MT} (3.1))",
"clamp(${T} (4.1), ${MT} (2.1), ${MT} (3.1))",
glu::TYPE_FLOAT,
1,
4,
......
......@@ -24,73 +24,73 @@ namespace gles31
{
Context::Context (tcu::TestContext& testCtx)
: m_testCtx (testCtx)
, m_renderCtx (DE_NULL)
, m_contextInfo (DE_NULL)
: m_testCtx (testCtx)
, m_renderCtx (DE_NULL)
, m_contextInfo (DE_NULL)
{
if (m_testCtx.getCommandLine().getRunMode() == tcu::RUNMODE_EXECUTE)
createRenderContext();
else
{
// \todo [2016-11-15 pyry] Many tests (erroneously) inspect context type
// during test hierarchy construction. We should fix that
// and revert dummy context to advertise unknown context type.
m_renderCtx = new glu::DummyRenderContext(glu::ContextType(glu::ApiType::es(3,1)));
}
if (m_testCtx.getCommandLine().getRunMode() == tcu::RUNMODE_EXECUTE)
createRenderContext();
else
{
// \todo [2016-11-15 pyry] Many tests (erroneously) inspect context type
// during test hierarchy construction. We should fix that
// and revert dummy context to advertise unknown context type.
m_renderCtx = new glu::DummyRenderContext(glu::ContextType(glu::ApiType::es(3,1)));
}
}
Context::~Context (void)
{
destroyRenderContext();
destroyRenderContext();
}
void Context::createRenderContext (void)
{
DE_ASSERT(!m_renderCtx && !m_contextInfo);
DE_ASSERT(!m_renderCtx && !m_contextInfo);
try
{
try
{
// Issue 3687
// OpenGL ES 3.2 contexts are not supported yet, and the 3.2 context creation failure results in
// tests that pass with the recreated 3.1 context being marked "fail".
// Revert with Issue 3688
#if 0
try
{
m_renderCtx = glu::createDefaultRenderContext(m_testCtx.getPlatform(), m_testCtx.getCommandLine(), glu::ApiType::es(3, 2));
}
catch (...)
{
m_renderCtx = glu::createDefaultRenderContext(m_testCtx.getPlatform(), m_testCtx.getCommandLine(), glu::ApiType::es(3, 1));
}
try
{
m_renderCtx = glu::createDefaultRenderContext(m_testCtx.getPlatform(), m_testCtx.getCommandLine(), glu::ApiType::es(3, 2));
}
catch (...)
{
m_renderCtx = glu::createDefaultRenderContext(m_testCtx.getPlatform(), m_testCtx.getCommandLine(), glu::ApiType::es(3, 1));
}
#else
// Override the original behavior (above) to only create a 3.1 context
m_renderCtx = glu::createDefaultRenderContext(m_testCtx.getPlatform(), m_testCtx.getCommandLine(), glu::ApiType::es(3, 1));
// Override the original behavior (above) to only create a 3.1 context
m_renderCtx = glu::createDefaultRenderContext(m_testCtx.getPlatform(), m_testCtx.getCommandLine(), glu::ApiType::es(3, 1));
#endif
m_contextInfo = glu::ContextInfo::create(*m_renderCtx);
}
catch (...)
{
destroyRenderContext();
throw;
}
m_contextInfo = glu::ContextInfo::create(*m_renderCtx);
}
catch (...)
{
destroyRenderContext();
throw;
}
}
void Context::destroyRenderContext (void)
{
delete m_contextInfo;
delete m_renderCtx;
delete m_contextInfo;
delete m_renderCtx;
m_contextInfo = DE_NULL;
m_renderCtx = DE_NULL;
m_contextInfo = DE_NULL;
m_renderCtx = DE_NULL;
}
const tcu::RenderTarget& Context::getRenderTarget (void) const
{
return m_renderCtx->getRenderTarget();
return m_renderCtx->getRenderTarget();
}
} // gles31
} // deqp
// clang-format on
\ No newline at end of file
// clang-format on
......@@ -322,7 +322,7 @@ void MultiviewCPUBoundBenchmark::initializeBenchmark()
"{\n"
" vec4 v = vPosition;\n"
" v.xy += uOffset;\n"
" gl_Position = v;\n"
" gl_Position = v;\n"
"}\n";
const std::string fs =
......@@ -421,7 +421,7 @@ void MultiviewGPUBoundBenchmark::initializeBenchmark()
" frag_Col3 = vert_Col3;\n"
" frag_Col4 = vert_Col4;\n"
" frag_Col5 = vert_Col5;\n"
" gl_Position = vPosition;\n"
" gl_Position = vPosition;\n"
"}\n";
const std::string &fs =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment