Commit 80bfe0f4 by Jamie Madill Committed by Commit Bot

translator: Fix style in CodeGen.cpp.

BUG=None Change-Id: I321ec7af6779c6524b83959da21520a4fb09d8e2 Reviewed-on: https://chromium-review.googlesource.com/408317 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 45bcc784
...@@ -6,15 +6,15 @@ ...@@ -6,15 +6,15 @@
#ifdef ANGLE_ENABLE_ESSL #ifdef ANGLE_ENABLE_ESSL
#include "compiler/translator/TranslatorESSL.h" #include "compiler/translator/TranslatorESSL.h"
#endif #endif // ANGLE_ENABLE_ESSL
#ifdef ANGLE_ENABLE_GLSL #ifdef ANGLE_ENABLE_GLSL
#include "compiler/translator/TranslatorGLSL.h" #include "compiler/translator/TranslatorGLSL.h"
#endif #endif // ANGLE_ENABLE_GLSL
#ifdef ANGLE_ENABLE_HLSL #ifdef ANGLE_ENABLE_HLSL
#include "compiler/translator/TranslatorHLSL.h" #include "compiler/translator/TranslatorHLSL.h"
#endif // ANGLE_ENABLE_HLSL #endif // ANGLE_ENABLE_HLSL
namespace sh namespace sh
{ {
...@@ -24,58 +24,61 @@ namespace sh ...@@ -24,58 +24,61 @@ namespace sh
// compile object used by higher level code. It returns // compile object used by higher level code. It returns
// a subclass of TCompiler. // a subclass of TCompiler.
// //
TCompiler* ConstructCompiler( TCompiler *ConstructCompiler(sh::GLenum type, ShShaderSpec spec, ShShaderOutput output)
sh::GLenum type, ShShaderSpec spec, ShShaderOutput output)
{ {
switch (output) { switch (output)
case SH_ESSL_OUTPUT: {
case SH_ESSL_OUTPUT:
#ifdef ANGLE_ENABLE_ESSL #ifdef ANGLE_ENABLE_ESSL
return new TranslatorESSL(type, spec); return new TranslatorESSL(type, spec);
#else #else
// This compiler is not supported in this configuration. Return NULL per the // This compiler is not supported in this configuration. Return NULL per the
// sh::ConstructCompiler API. // sh::ConstructCompiler API.
return nullptr; return nullptr;
#endif // ANGLE_ENABLE_ESSL #endif // ANGLE_ENABLE_ESSL
case SH_GLSL_130_OUTPUT:
case SH_GLSL_140_OUTPUT: case SH_GLSL_130_OUTPUT:
case SH_GLSL_150_CORE_OUTPUT: case SH_GLSL_140_OUTPUT:
case SH_GLSL_330_CORE_OUTPUT: case SH_GLSL_150_CORE_OUTPUT:
case SH_GLSL_400_CORE_OUTPUT: case SH_GLSL_330_CORE_OUTPUT:
case SH_GLSL_410_CORE_OUTPUT: case SH_GLSL_400_CORE_OUTPUT:
case SH_GLSL_420_CORE_OUTPUT: case SH_GLSL_410_CORE_OUTPUT:
case SH_GLSL_430_CORE_OUTPUT: case SH_GLSL_420_CORE_OUTPUT:
case SH_GLSL_440_CORE_OUTPUT: case SH_GLSL_430_CORE_OUTPUT:
case SH_GLSL_450_CORE_OUTPUT: case SH_GLSL_440_CORE_OUTPUT:
case SH_GLSL_COMPATIBILITY_OUTPUT: case SH_GLSL_450_CORE_OUTPUT:
case SH_GLSL_COMPATIBILITY_OUTPUT:
#ifdef ANGLE_ENABLE_GLSL #ifdef ANGLE_ENABLE_GLSL
return new TranslatorGLSL(type, spec, output); return new TranslatorGLSL(type, spec, output);
#else #else
// This compiler is not supported in this configuration. Return NULL per the // This compiler is not supported in this configuration. Return NULL per the
// sh::ConstructCompiler API. // sh::ConstructCompiler API.
return nullptr; return nullptr;
#endif // ANGLE_ENABLE_GLSL #endif // ANGLE_ENABLE_GLSL
case SH_HLSL_3_0_OUTPUT:
case SH_HLSL_4_1_OUTPUT: case SH_HLSL_3_0_OUTPUT:
case SH_HLSL_4_0_FL9_3_OUTPUT: case SH_HLSL_4_1_OUTPUT:
case SH_HLSL_4_0_FL9_3_OUTPUT:
#ifdef ANGLE_ENABLE_HLSL #ifdef ANGLE_ENABLE_HLSL
return new TranslatorHLSL(type, spec, output); return new TranslatorHLSL(type, spec, output);
#else #else
// This compiler is not supported in this configuration. Return NULL per the // This compiler is not supported in this configuration. Return NULL per the
// sh::ConstructCompiler API. // sh::ConstructCompiler API.
return nullptr; return nullptr;
#endif // ANGLE_ENABLE_HLSL #endif // ANGLE_ENABLE_HLSL
default:
// Unknown format. Return NULL per the sh::ConstructCompiler API. default:
return nullptr; // Unknown format. Return NULL per the sh::ConstructCompiler API.
return nullptr;
} }
} }
// //
// Delete the compiler made by ConstructCompiler // Delete the compiler made by ConstructCompiler
// //
void DeleteCompiler(TCompiler* compiler) void DeleteCompiler(TCompiler *compiler)
{ {
delete compiler; SafeDelete(compiler);
} }
} // namespace sh } // namespace sh
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