From: Eunki, Hong Date: Thu, 4 Aug 2022 06:09:01 +0000 (+0900) Subject: [Shader Generator] Remove empty first line X-Git-Tag: dali_2.1.35~3 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=7fedb219df999ade85e132809f21e06c9aefd4e4;hp=e8edbcff4d8a64f6675ee2dbeeef626ab48e36e0 [Shader Generator] Remove empty first line Trim the empty first line, so let the shader code start with "#version ~~~" Change-Id: I304f8690c66f66c3d90effcbc43b4ae895ba9691 Signed-off-by: Eunki, Hong --- diff --git a/dali-toolkit/shader-generator/shader-generator.cpp b/dali-toolkit/shader-generator/shader-generator.cpp index a88333c..16cddcc 100644 --- a/dali-toolkit/shader-generator/shader-generator.cpp +++ b/dali-toolkit/shader-generator/shader-generator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -144,10 +144,21 @@ void GenerateHeaderFile( << endl; outFile << "const std::string_view " << shaderVariableName << endl; outFile << "{" << endl; - outFile << "R\"(" << endl; + + // Using Raw String Literal to generate shader files as this will simplify the file layout. + // And it will fix some compilation warnings about missing terminating strings. + // Note : we should skip empty headline to guarantee that "#version ~~~" as top of shader code. + outFile << "R\"("; string line; + bool firstLinePrinted = false; while(getline(shaderFile, line)) { + if(!firstLinePrinted && line.find_first_not_of(" \t\r\n") == std::string::npos) + { + // Empty string occured! + continue; + } + firstLinePrinted = true; outFile << line << endl; } outFile << ")\"" << endl;