Edit

kc3-lang/angle/util/shader_utils.h

Branch :

  • Show log

    Commit

  • Author : Yuly Novikov
    Date : 2016-08-12 20:40:14
    Hash : e3352f94
    Message : Change angle_util to be a shared library So that there will be one instance of static thread synchronization variables in AndroidWindow. Previously there was one instance in lib_angle_deqp_gles2_tests__library and one in libangle_deqp_libgles2, resulting in AndroidWindow::initialize waiting forever. Also make the change in GYP build to fix standalone build, and fix rpath issues on Mac. BUG=angleproject:1471 TEST=end2end and deqp tests on standalone Win10 and end2end on GN Mac 10.11 Change-Id: I731578459400bb47d269df129aabed9b67b555e6 Reviewed-on: https://chromium-review.googlesource.com/376202 Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

  • util/shader_utils.h
  • //
    // Copyright (c) 2014 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.
    //
    
    #ifndef SAMPLE_UTIL_SHADER_UTILS_H
    #define SAMPLE_UTIL_SHADER_UTILS_H
    
    #include <export.h>
    #include <GLES3/gl31.h>
    #include <GLES3/gl3.h>
    #include <GLES2/gl2.h>
    #include <GLES2/gl2ext.h>
    #include <EGL/egl.h>
    #include <EGL/eglext.h>
    
    #include <string>
    #include <vector>
    
    #define SHADER_SOURCE(...) #__VA_ARGS__
    
    ANGLE_EXPORT GLuint CompileShader(GLenum type, const std::string &source);
    ANGLE_EXPORT GLuint CompileShaderFromFile(GLenum type, const std::string &sourcePath);
    
    ANGLE_EXPORT GLuint
    CompileProgramWithTransformFeedback(const std::string &vsSource,
                                        const std::string &fsSource,
                                        const std::vector<std::string> &transformFeedbackVaryings,
                                        GLenum bufferMode);
    ANGLE_EXPORT GLuint CompileProgram(const std::string &vsSource, const std::string &fsSource);
    ANGLE_EXPORT GLuint CompileProgramFromFiles(const std::string &vsPath, const std::string &fsPath);
    ANGLE_EXPORT GLuint CompileComputeProgram(const std::string &csSource,
                                              bool outputErrorMessages = true);
    
    #endif // SAMPLE_UTIL_SHADER_UTILS_H