Hash :
d2c52e3b
Author :
Date :
2015-10-14T17:07:05
Fix debug annotations and shaders. The Program refactor inadvertantly broken Debug annotations. Fix this by correctly passing the path to the temporary shader source in the first "C" string argument to ShCompile, instead of as the first part of the source string. BUG=angleproject:1177 TEST=manual testing with MSVS Change-Id: Ie77bb11b51645a474b542ddd2ae0f391e019e341 Reviewed-on: https://chromium-review.googlesource.com/306210 Tryjob-Request: Jamie Madill <jmadill@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
//
// Copyright 2015 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// ShaderGL.h: Defines the class interface for ShaderGL.
#ifndef LIBANGLE_RENDERER_GL_SHADERGL_H_
#define LIBANGLE_RENDERER_GL_SHADERGL_H_
#include "libANGLE/renderer/ShaderImpl.h"
namespace rx
{
class FunctionsGL;
struct WorkaroundsGL;
class ShaderGL : public ShaderImpl
{
public:
ShaderGL(const gl::Shader::Data &data,
const FunctionsGL *functions,
const WorkaroundsGL &workarounds);
~ShaderGL() override;
// ShaderImpl implementation
int prepareSourceAndReturnOptions(std::stringstream *sourceStream,
std::string *sourcePath) override;
bool postTranslateCompile(gl::Compiler *compiler, std::string *infoLog) override;
std::string getDebugInfo() const override;
GLuint getShaderID() const;
private:
const FunctionsGL *mFunctions;
const WorkaroundsGL &mWorkarounds;
GLuint mShaderID;
};
}
#endif // LIBANGLE_RENDERER_GL_SHADERGL_H_