Skip to content

Commit c168485

Browse files
enginmanapenginmanap
committed
Remove mediump usage from glm
1 parent f5f539b commit c168485

File tree

16 files changed

+47
-47
lines changed

16 files changed

+47
-47
lines changed

‎GraphicBackends/OpenGLESGraphics.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ bool OpenGLESGraphics::freeVAO(const GLuint bufferID) {
563563
}
564564

565565
void OpenGLESGraphics::bufferVertexData(const std::vector<glm::vec3> &vertices,
566-
const std::vector<glm::mediump_uvec3> &faces,
566+
const std::vector<glm::uvec3> &faces,
567567
uint32_t &vao, uint32_t &vbo, const uint32_t attachPointer,
568568
uint32_t &ebo) {
569569

@@ -576,7 +576,7 @@ void OpenGLESGraphics::bufferVertexData(const std::vector<glm::vec3> &vertices,
576576
// Set up the element array buffer
577577
ebo = generateBuffer(1);
578578
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo);
579-
glBufferData(GL_ELEMENT_ARRAY_BUFFER, faces.size() * sizeof(glm::mediump_uvec3), faces.data(), GL_STATIC_DRAW);
579+
glBufferData(GL_ELEMENT_ARRAY_BUFFER, faces.size() * sizeof(glm::uvec3), faces.data(), GL_STATIC_DRAW);
580580

581581
// Set up the vertex attributes
582582
vbo = generateBuffer(1);
@@ -654,11 +654,11 @@ void OpenGLESGraphics::bufferVertexTextureCoordinates(const std::vector<glm::vec
654654
}
655655

656656
void
657-
OpenGLESGraphics::updateVertexData(const std::vector<glm::vec3> &vertices, const std::vector<glm::mediump_uvec3> &faces,
657+
OpenGLESGraphics::updateVertexData(const std::vector<glm::vec3> &vertices, const std::vector<glm::uvec3> &faces,
658658
uint32_t &vbo, uint32_t &ebo) {
659659
// Set up the element array buffer
660660
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo);
661-
glBufferData(GL_ELEMENT_ARRAY_BUFFER, faces.size() * sizeof(glm::mediump_uvec3), faces.data(), GL_STATIC_DRAW);
661+
glBufferData(GL_ELEMENT_ARRAY_BUFFER, faces.size() * sizeof(glm::uvec3), faces.data(), GL_STATIC_DRAW);
662662

663663
// Set up the vertex attributes
664664
glBindBuffer(GL_ARRAY_BUFFER, vbo);

‎GraphicBackends/OpenGLESGraphics.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ class OpenGLESGraphics : public GraphicsInterface {
346346
void destroyProgram(uint32_t programID) override;
347347

348348
void bufferVertexData(const std::vector<glm::vec3> &vertices,
349-
const std::vector<glm::mediump_uvec3> &faces,
349+
const std::vector<glm::uvec3> &faces,
350350
uint32_t &vao, uint32_t &vbo, const uint32_t attachPointer, uint32_t &ebo) override;
351351

352352
void bufferNormalData(const std::vector<glm::vec3> &colors,
@@ -360,7 +360,7 @@ class OpenGLESGraphics : public GraphicsInterface {
360360

361361
void bufferVertexTextureCoordinates(const std::vector<glm::vec2> &textureCoordinates,
362362
uint32_t &vao, uint32_t &vbo, const uint32_t attachPointer) override;
363-
void updateVertexData(const std::vector<glm::vec3> &vertices, const std::vector<glm::mediump_uvec3> &faces,
363+
void updateVertexData(const std::vector<glm::vec3> &vertices, const std::vector<glm::uvec3> &faces,
364364
uint32_t &vbo, uint32_t &ebo);
365365
void updateNormalData(const std::vector<glm::vec3> &normals, uint32_t &vbo);
366366
void updateExtraVertexData(const std::vector<glm::vec4> &extraData, uint32_t &vbo);

‎GraphicBackends/OpenGLGraphics.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ bool OpenGLGraphics::freeVAO(const GLuint bufferID) {
575575
}
576576

577577
void OpenGLGraphics::bufferVertexData(const std::vector<glm::vec3> &vertices,
578-
const std::vector<glm::mediump_uvec3> &faces,
578+
const std::vector<glm::uvec3> &faces,
579579
uint32_t &vao, uint32_t &vbo, const uint32_t attachPointer,
580580
uint32_t &ebo) {
581581

@@ -588,7 +588,7 @@ void OpenGLGraphics::bufferVertexData(const std::vector<glm::vec3> &vertices,
588588
// Set up the element array buffer
589589
ebo = generateBuffer(1);
590590
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo);
591-
glBufferData(GL_ELEMENT_ARRAY_BUFFER, faces.size() * sizeof(glm::mediump_uvec3), faces.data(), GL_STATIC_DRAW);
591+
glBufferData(GL_ELEMENT_ARRAY_BUFFER, faces.size() * sizeof(glm::uvec3), faces.data(), GL_STATIC_DRAW);
592592

593593
// Set up the vertex attributes
594594
vbo = generateBuffer(1);
@@ -666,11 +666,11 @@ void OpenGLGraphics::bufferVertexTextureCoordinates(const std::vector<glm::vec2>
666666
}
667667

668668
void
669-
OpenGLGraphics::updateVertexData(const std::vector<glm::vec3> &vertices, const std::vector<glm::mediump_uvec3> &faces,
669+
OpenGLGraphics::updateVertexData(const std::vector<glm::vec3> &vertices, const std::vector<glm::uvec3> &faces,
670670
uint32_t &vbo, uint32_t &ebo) {
671671
// Set up the element array buffer
672672
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo);
673-
glBufferData(GL_ELEMENT_ARRAY_BUFFER, faces.size() * sizeof(glm::mediump_uvec3), faces.data(), GL_STATIC_DRAW);
673+
glBufferData(GL_ELEMENT_ARRAY_BUFFER, faces.size() * sizeof(glm::uvec3), faces.data(), GL_STATIC_DRAW);
674674

675675
// Set up the vertex attributes
676676
glBindBuffer(GL_ARRAY_BUFFER, vbo);

‎GraphicBackends/OpenGLGraphics.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ class OpenGLGraphics : public GraphicsInterface {
341341
void destroyProgram(uint32_t programID) override;
342342

343343
void bufferVertexData(const std::vector<glm::vec3> &vertices,
344-
const std::vector<glm::mediump_uvec3> &faces,
344+
const std::vector<glm::uvec3> &faces,
345345
uint32_t &vao, uint32_t &vbo, const uint32_t attachPointer, uint32_t &ebo) override;
346346

347347
void bufferNormalData(const std::vector<glm::vec3> &colors,
@@ -355,7 +355,7 @@ class OpenGLGraphics : public GraphicsInterface {
355355

356356
void bufferVertexTextureCoordinates(const std::vector<glm::vec2> &textureCoordinates,
357357
uint32_t &vao, uint32_t &vbo, const uint32_t attachPointer) override;
358-
void updateVertexData(const std::vector<glm::vec3> &vertices, const std::vector<glm::mediump_uvec3> &faces,
358+
void updateVertexData(const std::vector<glm::vec3> &vertices, const std::vector<glm::uvec3> &faces,
359359
uint32_t &vbo, uint32_t &ebo);
360360
void updateNormalData(const std::vector<glm::vec3> &normals, uint32_t &vbo);
361361
void updateExtraVertexData(const std::vector<glm::vec4> &extraData, uint32_t &vbo);

‎samples/SSAOKernelRenderMethod.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ void SSAOKernelRenderMethod::setupQuad() {
5959
vertices.emplace_back(glm::vec3( 1.0f, 1.0f, 0.0f));
6060
vertices.emplace_back(glm::vec3( 1.0f, -1.0f, 0.0f));
6161

62-
std::vector<glm::mediump_uvec3> faces;
62+
std::vector<glm::uvec3> faces;
6363

64-
faces.emplace_back(glm::mediump_uvec3(0,1,2));
65-
faces.emplace_back(glm::mediump_uvec3(2,1,3));
64+
faces.emplace_back(glm::uvec3(0,1,2));
65+
faces.emplace_back(glm::uvec3(2,1,3));
6666

6767
std::vector<glm::vec2> textureCoordinates;
6868

‎src/Assets/MeshAsset.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class MeshAsset {
3232

3333
std::vector<glm::vec3> vertices;
3434
std::vector<glm::vec3> normals;
35-
std::vector<glm::mediump_uvec3> faces; //Possible reason for non portable data
35+
std::vector<glm::uvec3> faces; //Possible reason for non portable data
3636
std::vector<glm::vec2> textureCoordinates;
3737
std::string name;
3838

‎src/GUI/GUIRenderable.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ GUIRenderable::GUIRenderable(GraphicsInterface* graphicsWrapper) : Renderable(gr
1111
vertices.push_back(glm::vec3(1.0f, 1.0f, 0.0f));
1212
vertices.push_back(glm::vec3(-1.0f, 1.0f, 0.0f));
1313

14-
faces.push_back(glm::mediump_uvec3(0, 1, 2));//front
15-
faces.push_back(glm::mediump_uvec3(0, 2, 3));
14+
faces.push_back(glm::uvec3(0, 1, 2));//front
15+
faces.push_back(glm::uvec3(0, 2, 3));
1616

1717
uint32_t vbo;
1818
graphicsWrapper->bufferVertexData(vertices, faces, vao, vbo, 2, ebo);

‎src/GUI/GUIRenderable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class GUIRenderable : public Renderable {
1717

1818
protected:
1919
//TODO maybe this should not be protected, but private
20-
std::vector<glm::mediump_uvec3> faces;
20+
std::vector<glm::uvec3> faces;
2121
uint32_t textureID;
2222

2323
public:

‎src/GameObjects/SkyBox.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,23 @@ SkyBox::SkyBox(uint32_t objectID, std::shared_ptr<AssetManager> assetManager, st
2727
vertices.push_back(glm::vec3(-1.0f, 1.0f, 1.0f));
2828

2929
//front
30-
faces.push_back(glm::mediump_uvec3(0, 1, 2));
31-
faces.push_back(glm::mediump_uvec3(0, 2, 3));
30+
faces.push_back(glm::uvec3(0, 1, 2));
31+
faces.push_back(glm::uvec3(0, 2, 3));
3232
//Back
33-
faces.push_back(glm::mediump_uvec3(4, 7, 6));
34-
faces.push_back(glm::mediump_uvec3(4, 6, 5));
33+
faces.push_back(glm::uvec3(4, 7, 6));
34+
faces.push_back(glm::uvec3(4, 6, 5));
3535
//right
36-
faces.push_back(glm::mediump_uvec3(4, 0, 3));
37-
faces.push_back(glm::mediump_uvec3(4, 3, 7));
36+
faces.push_back(glm::uvec3(4, 0, 3));
37+
faces.push_back(glm::uvec3(4, 3, 7));
3838
//left
39-
faces.push_back(glm::mediump_uvec3(5, 6, 2));
40-
faces.push_back(glm::mediump_uvec3(5, 2, 1));
39+
faces.push_back(glm::uvec3(5, 6, 2));
40+
faces.push_back(glm::uvec3(5, 2, 1));
4141
//down
42-
faces.push_back(glm::mediump_uvec3(4, 1, 0));
43-
faces.push_back(glm::mediump_uvec3(4, 5, 1));
42+
faces.push_back(glm::uvec3(4, 1, 0));
43+
faces.push_back(glm::uvec3(4, 5, 1));
4444
//up
45-
faces.push_back(glm::mediump_uvec3(3, 6, 7));
46-
faces.push_back(glm::mediump_uvec3(3, 2, 6));
45+
faces.push_back(glm::uvec3(3, 6, 7));
46+
faces.push_back(glm::uvec3(3, 2, 6));
4747

4848

4949
uint32_t vbo;

‎src/GameObjects/SkyBox.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class SkyBox : public Renderable, public GameObject {
3333

3434
private:
3535
std::vector<glm::vec3> vertices;
36-
std::vector<glm::mediump_uvec3> faces;
36+
std::vector<glm::uvec3> faces;
3737

3838
std::shared_ptr<CubeMapAsset> cubeMap;
3939
glm::mat4 viewMatrix;

0 commit comments

Comments
 (0)