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 270 271 272 273 274 275 276 277 278 279
//
// Copyright 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.
//
// Based on Hello_Triangle.c from
// Book: OpenGL(R) ES 2.0 Programming Guide
// Authors: Aaftab Munshi, Dan Ginsburg, Dave Shreiner
// ISBN-10: 0321502795
// ISBN-13: 9780321502797
// Publisher: Addison-Wesley Professional
// URLs: http://safari.informit.com/9780321563835
// http://www.opengles-book.com
#include "SampleApplication.h"
#include "texture_utils.h"
#include "util/shader_utils.h"
#include <cstring>
#include <iostream>
// This sample demonstrates the differences in rendering efficiency when
// drawing with already-created textures whose dimensions have been altered
// versus drawing with newly created textures.
//
// In order to support GL's per-level texture creation semantics over the
// D3D API in particular, which requires textures' full mip chains to be
// created at texture object creation time, ANGLE maintains copies of the
// constituent texture images in system memory until the texture is used in
// a draw call, at which time, if the texture passes GL's mip completeness
// rules, the D3D texture is created and the contents of the texture are
// uploaded. Once the texture is created, redefinition of the dimensions or
// format of the texture is costly-- a new D3D texture needs to be created,
// and ANGLE may need to read the contents back into system memory.
//
// Creating an entirely new texture also requires that a new D3D texture be
// created, but any overhead associated with tracking the already-present
// texture images is eliminated, as it's a novel texture. This sample
// demonstrates the contrast in draw call time between these two situations.
//
// The resizing & creation of a new texture is delayed until several frames
// after startup, to eliminate draw time differences caused by caching of
// rendering state subsequent to the first frame.
class TexRedefBenchSample : public SampleApplication
{
public:
TexRedefBenchSample(int argc, char **argv)
: SampleApplication("Microbench", argc, argv, ClientType::ES2, 1280, 1280),
mPixelsResize(nullptr),
mPixelsNewTex(nullptr),
mTimeFrame(false),
mFrameCount(0)
{}
void defineSquareTexture2D(GLuint texId,
GLsizei baseDimension,
GLenum format,
GLenum type,
void *data)
{
glBindTexture(GL_TEXTURE_2D, texId);
GLsizei curDim = baseDimension;
GLuint level = 0;
while (curDim >= 1)
{
glTexImage2D(GL_TEXTURE_2D, level, format, curDim, curDim, 0, format, type, data);
curDim /= 2;
level++;
}
}
void createPixelData()
{
mPixelsResize = new GLubyte[512 * 512 * 4];
mPixelsNewTex = new GLubyte[512 * 512 * 4];
GLubyte *pixPtr0 = mPixelsResize;
GLubyte *pixPtr1 = mPixelsNewTex;
GLubyte zeroPix[] = {0, 192, 192, 255};
GLubyte onePix[] = {192, 0, 0, 255};
for (int i = 0; i < 512 * 512; ++i)
{
memcpy(pixPtr0, zeroPix, 4 * sizeof(GLubyte));
memcpy(pixPtr1, onePix, 4 * sizeof(GLubyte));
pixPtr0 += 4;
pixPtr1 += 4;
}
}
bool initialize() override
{
constexpr char kVS[] = R"(attribute vec4 a_position;
attribute vec2 a_texCoord;
varying vec2 v_texCoord;
void main()
{
gl_Position = a_position;
v_texCoord = a_texCoord;
})";
constexpr char kFS[] = R"(precision mediump float;
varying vec2 v_texCoord;
uniform sampler2D s_texture;
void main()
{
gl_FragColor = texture2D(s_texture, v_texCoord);
})";
mProgram = CompileProgram(kVS, kFS);
if (!mProgram)
{
return false;
}
// Get the attribute locations
mPositionLoc = glGetAttribLocation(mProgram, "a_position");
mTexCoordLoc = glGetAttribLocation(mProgram, "a_texCoord");
// Get the sampler location
mSamplerLoc = glGetUniformLocation(mProgram, "s_texture");
// Generate texture IDs, and create texture 0
glGenTextures(3, mTextureIds);
createPixelData();
defineSquareTexture2D(mTextureIds[0], 256, GL_RGBA, GL_UNSIGNED_BYTE, mPixelsResize);
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
return true;
}
void destroy() override
{
glDeleteProgram(mProgram);
delete[] mPixelsResize;
delete[] mPixelsNewTex;
}
void draw() override
{
GLfloat vertices[] = {
-0.5f, 0.5f, 0.0f, // Position 0
0.0f, 0.0f, // TexCoord 0
-0.5f, -0.5f, 0.0f, // Position 1
0.0f, 1.0f, // TexCoord 1
0.5f, -0.5f, 0.0f, // Position 2
1.0f, 1.0f, // TexCoord 2
0.5f, 0.5f, 0.0f, // Position 3
1.0f, 0.0f // TexCoord 3
};
GLushort indices[] = {0, 1, 2, 0, 2, 3};
// Set the viewport
glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
// Clear the color buffer
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
// Use the program object
glUseProgram(mProgram);
// Load the vertex position
glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), vertices);
// Load the texture coordinate
glVertexAttribPointer(mTexCoordLoc, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat),
vertices + 3);
glEnableVertexAttribArray(mPositionLoc);
glEnableVertexAttribArray(mTexCoordLoc);
// Bind the texture
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, mTextureIds[0]);
// Set the texture sampler to texture unit to 0
glUniform1i(mSamplerLoc, 0);
// We delay timing of texture resize/creation until after the first frame, as
// caching optimizations will reduce draw time for subsequent frames for reasons
// unreleated to texture creation. mTimeFrame is set to true on the fifth frame.
if (mTimeFrame)
{
mOrigTimer.start();
}
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
if (mTimeFrame)
{
mOrigTimer.stop();
// This timer indicates draw time for an already-created texture resident on the GPU,
// which needs no updates. It will be faster than the other draws.
std::cout << "Original texture draw: " << mOrigTimer.getElapsedWallClockTime() * 1000
<< "msec" << std::endl;
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
// Now, change the texture dimensions of the original texture
mResizeDefineTimer.start();
defineSquareTexture2D(mTextureIds[0], 512, GL_RGBA, GL_UNSIGNED_BYTE, mPixelsResize);
mResizeDefineTimer.stop();
mResizeDrawTimer.start();
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
mResizeDrawTimer.stop();
// This timer indicates draw time for a texture which has already been used in a draw,
// causing the underlying resource to be allocated, and then resized, requiring resource
// reallocation and related overhead.
std::cout << "Resized texture definition: "
<< mResizeDefineTimer.getElapsedWallClockTime() * 1000 << "msec" << std::endl;
std::cout << "Resized texture draw: "
<< mResizeDrawTimer.getElapsedWallClockTime() * 1000 << "msec" << std::endl;
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
// Create texure at same dimensions we resized previous texture to
mNewTexDefineTimer.start();
defineSquareTexture2D(mTextureIds[1], 512, GL_RGBA, GL_UNSIGNED_BYTE, mPixelsNewTex);
mNewTexDefineTimer.stop();
mNewTexDrawTimer.start();
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
mNewTexDrawTimer.stop();
// This timer indicates draw time for a texture newly created this frame. The underlying
// resource will need to be created, but because it has not previously been used, there
// is no already-resident texture object to manage. This draw is expected to be faster
// than the resized texture draw.
std::cout << "Newly created texture definition: "
<< mNewTexDefineTimer.getElapsedWallClockTime() * 1000 << "msec" << std::endl;
std::cout << "Newly created texture draw: "
<< mNewTexDrawTimer.getElapsedWallClockTime() * 1000 << "msec" << std::endl;
}
if (mFrameCount == 5)
mTimeFrame = true;
else
mTimeFrame = false;
mFrameCount++;
}
private:
// Handle to a program object
GLuint mProgram;
// Attribute locations
GLint mPositionLoc;
GLint mTexCoordLoc;
// Sampler location
GLint mSamplerLoc;
// Texture handle
GLuint mTextureIds[2]; // 0: texture created, then resized
// 1: texture newly created with TexImage
// Texture pixel data
GLubyte *mPixelsResize;
GLubyte *mPixelsNewTex;
Timer mOrigTimer;
Timer mResizeDrawTimer;
Timer mResizeDefineTimer;
Timer mNewTexDrawTimer;
Timer mNewTexDefineTimer;
bool mTimeFrame;
unsigned int mFrameCount;
};
int main(int argc, char **argv)
{
TexRedefBenchSample app(argc, argv);
return app.run();
}