Hash :
5a65a2b1
Author :
Date :
2022-07-06T11:46:17
Fix samples' arguments to SampleApplication Two new parameters were added in https://chromium-review.googlesource.com/c/angle/angle/+/3664916 with default values, but not all samples were updated to accomodate them. As a result, many samples passed in the major version for client type and thus couldn't run. This change introduces an enum class for the client type + version to make sure such a mistake is impossible. Bug: angleproject:7360 Change-Id: I450edee612d08a7b67530b61615f63268fefb200 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3748413 Auto-Submit: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Lingfeng Yang <lfy@google.com> Commit-Queue: Shahbaz Youssefi <syoussefi@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 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269
//
// Copyright 2021 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.
//
// Based on CubeMapActivity.java from The Android Open Source Project ApiDemos
// https://android.googlesource.com/platform/development/+/refs/heads/master/samples/ApiDemos/src/com/example/android/apis/graphics/CubeMapActivity.java
// Hue to RGB conversion in GLSL based on
// https://github.com/tobspr/GLSL-Color-Spaces
#include "SampleApplication.h"
#include "common/debug.h"
#include "torus.h"
#include "util/Matrix.h"
#include "util/shader_utils.h"
#include <iostream>
const float kDegreesPerSecond = 90.0f;
const GLushort kHuesSize = (kSize + 1) * (kSize + 1);
class BufferStorageSample : public SampleApplication
{
public:
BufferStorageSample(int argc, char **argv)
: SampleApplication("GLES3.1 Buffer Storage", argc, argv, ClientType::ES3_1)
{}
bool initialize() override
{
if (!IsGLExtensionEnabled("GL_EXT_buffer_storage"))
{
std::cout << "GL_EXT_buffer_storage not available." << std::endl;
return false;
}
constexpr char kVS[] = R"(#version 300 es
uniform mat4 mv;
uniform mat4 mvp;
in vec4 position;
in vec3 normal;
in float hue;
out vec3 normal_view;
out vec4 color;
vec4 hue_to_rgba(float hue)
{
hue = mod(hue, 1.0);
float r = abs(hue * 6.0 - 3.0) - 1.0;
float g = 2.0 - abs(hue * 6.0 - 2.0);
float b = 2.0 - abs(hue * 6.0 - 4.0);
return vec4(r, g, b, 1.0);
}
void main()
{
normal_view = vec3(mv * vec4(normal, 0.0));
color = hue_to_rgba(hue);
gl_Position = mvp * position;
})";
constexpr char kFS[] = R"(#version 300 es
precision mediump float;
in vec3 normal_view;
in vec4 color;
out vec4 frag_color;
void main()
{
frag_color = color * dot(vec3(0.0, 0.0, 1.0), normalize(normal_view));
})";
mProgram = CompileProgram(kVS, kFS);
if (!mProgram)
{
return false;
}
mPositionLoc = glGetAttribLocation(mProgram, "position");
mNormalLoc = glGetAttribLocation(mProgram, "normal");
mHueLoc = glGetAttribLocation(mProgram, "hue");
mMVPMatrixLoc = glGetUniformLocation(mProgram, "mvp");
mMVMatrixLoc = glGetUniformLocation(mProgram, "mv");
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
glEnable(GL_DEPTH_TEST);
generateTorus();
float ratio = static_cast<float>(getWindow()->getWidth()) /
static_cast<float>(getWindow()->getHeight());
mPerspectiveMatrix = Matrix4::frustum(-ratio, ratio, -1, 1, 1.0f, 20.0f);
mTranslationMatrix = Matrix4::translate(angle::Vector3(0, 0, -5));
glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
glUseProgram(mProgram);
glEnableVertexAttribArray(mPositionLoc);
glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, false, 6 * sizeof(GLfloat), nullptr);
glVertexAttribPointer(mNormalLoc, 3, GL_FLOAT, false, 6 * sizeof(GLfloat),
reinterpret_cast<const void *>(3 * sizeof(GLfloat)));
glEnableVertexAttribArray(mNormalLoc);
glBindBuffer(GL_ARRAY_BUFFER, mHueBuffer);
glVertexAttribPointer(mHueLoc, 1, GL_FLOAT, false, sizeof(GLfloat), nullptr);
glEnableVertexAttribArray(mHueLoc);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer);
return true;
}
void destroy() override
{
glBindBuffer(GL_ARRAY_BUFFER, mHueBuffer);
glUnmapBuffer(GL_ARRAY_BUFFER);
glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
glDisableVertexAttribArray(mPositionLoc);
glDisableVertexAttribArray(mNormalLoc);
glDisableVertexAttribArray(mHueLoc);
glDeleteBuffers(1, &mHueBuffer);
glDeleteBuffers(1, &mVertexBuffer);
glDeleteBuffers(1, &mIndexBuffer);
glDeleteProgram(mProgram);
}
void step(float dt, double totalTime) override
{
mAngle += kDegreesPerSecond * dt;
if (mLastFullSecond != static_cast<uint32_t>(totalTime))
{
mLastFullSecond = static_cast<uint32_t>(totalTime);
regenerateTorus();
}
updateHues(totalTime);
}
void draw() override
{
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
Matrix4 modelMatrix = mTranslationMatrix * Matrix4::rotate(mAngle, mYUnitVec) *
Matrix4::rotate(mAngle * 0.25f, mXUnitVec);
Matrix4 mvpMatrix = mPerspectiveMatrix * modelMatrix;
glUniformMatrix4fv(mMVMatrixLoc, 1, GL_FALSE, modelMatrix.data);
glUniformMatrix4fv(mMVPMatrixLoc, 1, GL_FALSE, mvpMatrix.data);
glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, false, 6 * sizeof(GLfloat), nullptr);
glVertexAttribPointer(mNormalLoc, 3, GL_FLOAT, false, 6 * sizeof(GLfloat),
reinterpret_cast<const void *>(3 * sizeof(GLfloat)));
glBindBuffer(GL_ARRAY_BUFFER, mHueBuffer);
glVertexAttribPointer(mHueLoc, 1, GL_FLOAT, false, sizeof(GLfloat), nullptr);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer);
glVertexAttribPointer(mHueLoc, 1, GL_FLOAT, false, sizeof(GLfloat), nullptr);
glDrawElements(GL_TRIANGLES, mIndexCount, GL_UNSIGNED_SHORT, 0);
ASSERT(static_cast<GLenum>(GL_NO_ERROR) == glGetError());
}
void updateHues(double time)
{
for (uint32_t i = 0; i < kHuesSize; i++)
{
mHueMapPtr[i] = static_cast<GLfloat>(i) / static_cast<GLfloat>(kHuesSize) +
static_cast<GLfloat>(time);
}
GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
glClientWaitSync(sync, 0, 0);
glDeleteSync(sync);
}
void generateTorus()
{
GenerateTorus(&mVertexBuffer, &mIndexBuffer, &mIndexCount);
std::vector<GLfloat> hues(kHuesSize, 0.0f);
glGenBuffers(1, &mHueBuffer);
glBindBuffer(GL_ARRAY_BUFFER, mHueBuffer);
glBufferStorageEXT(GL_ARRAY_BUFFER, kHuesSize * sizeof(GLfloat), hues.data(),
GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT_EXT | GL_MAP_COHERENT_BIT_EXT);
mHueMapPtr = static_cast<float *>(
glMapBufferRange(GL_ARRAY_BUFFER, 0, kHuesSize * sizeof(GLfloat),
GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT |
GL_MAP_PERSISTENT_BIT_EXT | GL_MAP_COHERENT_BIT_EXT));
ASSERT(mHueMapPtr != nullptr);
ASSERT(static_cast<GLenum>(GL_NO_ERROR) == glGetError());
}
void regenerateTorus()
{
glBindBuffer(GL_ARRAY_BUFFER, mHueBuffer);
glDisableVertexAttribArray(mHueLoc);
glUnmapBuffer(GL_ARRAY_BUFFER);
glDeleteBuffers(1, &mHueBuffer);
std::vector<GLfloat> hues(kHuesSize, 0.0f);
glGenBuffers(1, &mHueBuffer);
glBindBuffer(GL_ARRAY_BUFFER, mHueBuffer);
glBufferStorageEXT(GL_ARRAY_BUFFER, kHuesSize * sizeof(GLfloat), hues.data(),
GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT_EXT | GL_MAP_COHERENT_BIT_EXT);
mHueMapPtr = static_cast<float *>(
glMapBufferRange(GL_ARRAY_BUFFER, 0, kHuesSize * sizeof(GLfloat),
GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT |
GL_MAP_PERSISTENT_BIT_EXT | GL_MAP_COHERENT_BIT_EXT));
ASSERT(mHueMapPtr != nullptr);
ASSERT(static_cast<GLenum>(GL_NO_ERROR) == glGetError());
glEnableVertexAttribArray(mHueLoc);
GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
glClientWaitSync(sync, 0, 0);
glDeleteSync(sync);
}
private:
GLuint mProgram = 0;
GLint mPositionLoc = 0;
GLint mNormalLoc = 0;
GLint mHueLoc = 0;
GLuint mMVPMatrixLoc = 0;
GLuint mMVMatrixLoc = 0;
GLuint mVertexBuffer = 0;
GLuint mHueBuffer = 0;
GLuint mIndexBuffer = 0;
GLsizei mIndexCount = 0;
Matrix4 mPerspectiveMatrix;
Matrix4 mTranslationMatrix;
const angle::Vector3 mYUnitVec{0.0f, 1.0f, 0.0f};
const angle::Vector3 mXUnitVec{1.0f, 0.0f, 0.0f};
float *mHueMapPtr = nullptr;
float mAngle = 0;
uint32_t mLastFullSecond = 0;
};
int main(int argc, char **argv)
{
BufferStorageSample app(argc, argv);
return app.run();
}