mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-19 13:03:36 +00:00
Format all C++ and Java code via clang-format
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#include "drape/gl_functions.hpp"
|
||||
#include "drape/gl_includes.hpp"
|
||||
#include "drape/gl_extensions_list.hpp"
|
||||
#include "drape/gl_includes.hpp"
|
||||
|
||||
#include "base/assert.hpp"
|
||||
#include "base/logging.hpp"
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "std/target_os.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstring> // strlen
|
||||
#include <cstring> // strlen
|
||||
#include <limits>
|
||||
#include <map>
|
||||
#include <mutex>
|
||||
@@ -37,7 +37,10 @@ BoundMap g_boundBuffers;
|
||||
std::mutex g_boundBuffersMutex;
|
||||
#endif
|
||||
|
||||
inline GLboolean convert(bool v) { return static_cast<GLboolean>(v ? GL_TRUE : GL_FALSE); }
|
||||
inline GLboolean convert(bool v)
|
||||
{
|
||||
return static_cast<GLboolean>(v ? GL_TRUE : GL_FALSE);
|
||||
}
|
||||
|
||||
typedef void(DP_APIENTRY * TglClearColorFn)(GLfloat r, GLfloat g, GLfloat b, GLfloat a);
|
||||
typedef void(DP_APIENTRY * TglClearFn)(GLbitfield mask);
|
||||
@@ -51,14 +54,12 @@ typedef void(DP_APIENTRY * TglActiveTextureFn)(GLenum texture);
|
||||
typedef void(DP_APIENTRY * TglBlendEquationFn)(GLenum mode);
|
||||
|
||||
#ifndef GL_VERSION_4_3
|
||||
using GLDEBUGPROC = void(DP_APIENTRY *)(GLenum source, GLenum type, GLuint id, GLenum severity,
|
||||
GLsizei length, GLchar const * message,
|
||||
void * const userParam);
|
||||
using GLDEBUGPROC = void(DP_APIENTRY *)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length,
|
||||
GLchar const * message, void * const userParam);
|
||||
#endif
|
||||
typedef void(DP_APIENTRY * TglDebugMessageCallbackFn)(GLDEBUGPROC callback, void const * userParam);
|
||||
typedef void(DP_APIENTRY * TglDebugMessageControlFn)(GLenum source, GLenum type, GLenum severity,
|
||||
GLsizei count, GLuint const * ids,
|
||||
GLboolean enabled);
|
||||
typedef void(DP_APIENTRY * TglDebugMessageControlFn)(GLenum source, GLenum type, GLenum severity, GLsizei count,
|
||||
GLuint const * ids, GLboolean enabled);
|
||||
|
||||
typedef void(DP_APIENTRY * TglGenVertexArraysFn)(GLsizei n, GLuint * ids);
|
||||
typedef void(DP_APIENTRY * TglBindVertexArrayFn)(GLuint id);
|
||||
@@ -68,25 +69,21 @@ typedef void(DP_APIENTRY * TglGetBufferParameterFn)(GLenum target, GLenum value,
|
||||
typedef void(DP_APIENTRY * TglGenBuffersFn)(GLsizei n, GLuint * buffers);
|
||||
typedef void(DP_APIENTRY * TglBindBufferFn)(GLenum target, GLuint buffer);
|
||||
typedef void(DP_APIENTRY * TglDeleteBuffersFn)(GLsizei n, GLuint const * buffers);
|
||||
typedef void(DP_APIENTRY * TglBufferDataFn)(GLenum target, GLsizeiptr size, GLvoid const * data,
|
||||
GLenum usage);
|
||||
typedef void(DP_APIENTRY * TglBufferSubDataFn)(GLenum target, GLintptr offset, GLsizeiptr size,
|
||||
GLvoid const * data);
|
||||
typedef void(DP_APIENTRY * TglBufferDataFn)(GLenum target, GLsizeiptr size, GLvoid const * data, GLenum usage);
|
||||
typedef void(DP_APIENTRY * TglBufferSubDataFn)(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid const * data);
|
||||
typedef void *(DP_APIENTRY * TglMapBufferFn)(GLenum target, GLenum access);
|
||||
typedef GLboolean(DP_APIENTRY * TglUnmapBufferFn)(GLenum target);
|
||||
typedef void *(DP_APIENTRY * TglMapBufferRangeFn)(GLenum target, GLintptr offset, GLsizeiptr length,
|
||||
GLbitfield access);
|
||||
typedef void(DP_APIENTRY * TglFlushMappedBufferRangeFn)(GLenum target, GLintptr offset,
|
||||
GLsizeiptr length);
|
||||
typedef void *(DP_APIENTRY * TglMapBufferRangeFn)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
|
||||
typedef void(DP_APIENTRY * TglFlushMappedBufferRangeFn)(GLenum target, GLintptr offset, GLsizeiptr length);
|
||||
|
||||
typedef GLuint(DP_APIENTRY * TglCreateShaderFn)(GLenum type);
|
||||
typedef void(DP_APIENTRY * TglShaderSourceFn)(GLuint shaderID, GLsizei count,
|
||||
GLchar const * const * string, GLint const * length);
|
||||
typedef void(DP_APIENTRY * TglShaderSourceFn)(GLuint shaderID, GLsizei count, GLchar const * const * string,
|
||||
GLint const * length);
|
||||
typedef void(DP_APIENTRY * TglCompileShaderFn)(GLuint shaderID);
|
||||
typedef void(DP_APIENTRY * TglDeleteShaderFn)(GLuint shaderID);
|
||||
typedef void(DP_APIENTRY * TglGetShaderivFn)(GLuint shaderID, GLenum name, GLint * p);
|
||||
typedef void(DP_APIENTRY * TglGetShaderInfoLogFn)(GLuint shaderID, GLsizei maxLength,
|
||||
GLsizei * length, GLchar * infoLog);
|
||||
typedef void(DP_APIENTRY * TglGetShaderInfoLogFn)(GLuint shaderID, GLsizei maxLength, GLsizei * length,
|
||||
GLchar * infoLog);
|
||||
|
||||
typedef GLuint(DP_APIENTRY * TglCreateProgramFn)();
|
||||
typedef void(DP_APIENTRY * TglAttachShaderFn)(GLuint programID, GLuint shaderID);
|
||||
@@ -94,22 +91,19 @@ typedef void(DP_APIENTRY * TglDetachShaderFn)(GLuint programID, GLuint shaderID)
|
||||
typedef void(DP_APIENTRY * TglLinkProgramFn)(GLuint programID);
|
||||
typedef void(DP_APIENTRY * TglDeleteProgramFn)(GLuint programID);
|
||||
typedef void(DP_APIENTRY * TglGetProgramivFn)(GLuint programID, GLenum name, GLint * p);
|
||||
typedef void(DP_APIENTRY * TglGetProgramInfoLogFn)(GLuint programID, GLsizei maxLength,
|
||||
GLsizei * length, GLchar * infoLog);
|
||||
typedef void(DP_APIENTRY * TglGetProgramInfoLogFn)(GLuint programID, GLsizei maxLength, GLsizei * length,
|
||||
GLchar * infoLog);
|
||||
|
||||
typedef void(DP_APIENTRY * TglUseProgramFn)(GLuint programID);
|
||||
typedef GLint(DP_APIENTRY * TglGetAttribLocationFn)(GLuint program, GLchar const * name);
|
||||
typedef void(DP_APIENTRY * TglBindAttribLocationFn)(GLuint program, GLuint index,
|
||||
GLchar const * name);
|
||||
typedef void(DP_APIENTRY * TglBindAttribLocationFn)(GLuint program, GLuint index, GLchar const * name);
|
||||
|
||||
typedef void(DP_APIENTRY * TglEnableVertexAttributeFn)(GLuint location);
|
||||
typedef void(DP_APIENTRY * TglVertexAttributePointerFn)(GLuint index, GLint count, GLenum type,
|
||||
GLboolean normalize, GLsizei stride,
|
||||
GLvoid const * p);
|
||||
typedef void(DP_APIENTRY * TglVertexAttributePointerFn)(GLuint index, GLint count, GLenum type, GLboolean normalize,
|
||||
GLsizei stride, GLvoid const * p);
|
||||
typedef GLint(DP_APIENTRY * TglGetUniformLocationFn)(GLuint programID, GLchar const * name);
|
||||
typedef void(DP_APIENTRY * TglGetActiveUniformFn)(GLuint programID, GLuint uniformIndex,
|
||||
GLsizei bufSize, GLsizei * length, GLint * size,
|
||||
GLenum * type, GLchar * name);
|
||||
typedef void(DP_APIENTRY * TglGetActiveUniformFn)(GLuint programID, GLuint uniformIndex, GLsizei bufSize,
|
||||
GLsizei * length, GLint * size, GLenum * type, GLchar * name);
|
||||
typedef void(DP_APIENTRY * TglUniform1iFn)(GLint location, GLint value);
|
||||
typedef void(DP_APIENTRY * TglUniform2iFn)(GLint location, GLint v1, GLint v2);
|
||||
typedef void(DP_APIENTRY * TglUniform3iFn)(GLint location, GLint v1, GLint v2, GLint v3);
|
||||
@@ -118,21 +112,19 @@ typedef void(DP_APIENTRY * TglUniform1ivFn)(GLint location, GLsizei count, GLint
|
||||
typedef void(DP_APIENTRY * TglUniform1fFn)(GLint location, GLfloat value);
|
||||
typedef void(DP_APIENTRY * TglUniform2fFn)(GLint location, GLfloat v1, GLfloat v2);
|
||||
typedef void(DP_APIENTRY * TglUniform3fFn)(GLint location, GLfloat v1, GLfloat v2, GLfloat v3);
|
||||
typedef void(DP_APIENTRY * TglUniform4fFn)(GLint location, GLfloat v1, GLfloat v2, GLfloat v3,
|
||||
GLfloat v4);
|
||||
typedef void(DP_APIENTRY * TglUniform4fFn)(GLint location, GLfloat v1, GLfloat v2, GLfloat v3, GLfloat v4);
|
||||
typedef void(DP_APIENTRY * TglUniform1fvFn)(GLint location, GLsizei count, GLfloat const * value);
|
||||
typedef void(DP_APIENTRY * TglUniformMatrix4fvFn)(GLint location, GLsizei count,
|
||||
GLboolean transpose, GLfloat const * value);
|
||||
typedef void(DP_APIENTRY * TglUniformMatrix4fvFn)(GLint location, GLsizei count, GLboolean transpose,
|
||||
GLfloat const * value);
|
||||
|
||||
typedef void(DP_APIENTRY * TglGenFramebuffersFn)(GLsizei n, GLuint * framebuffers);
|
||||
typedef void(DP_APIENTRY * TglDeleteFramebuffersFn)(GLsizei n, GLuint const * framebuffers);
|
||||
typedef void(DP_APIENTRY * TglBindFramebufferFn)(GLenum target, GLuint id);
|
||||
typedef void(DP_APIENTRY * TglFramebufferTexture2DFn)(GLenum target, GLenum attachment,
|
||||
GLenum textarget, GLuint texture,
|
||||
GLint level);
|
||||
typedef void(DP_APIENTRY * TglFramebufferTexture2DFn)(GLenum target, GLenum attachment, GLenum textarget,
|
||||
GLuint texture, GLint level);
|
||||
typedef GLenum(DP_APIENTRY * TglCheckFramebufferStatusFn)(GLenum target);
|
||||
|
||||
typedef GLubyte const * (DP_APIENTRY * TglGetStringiFn) (GLenum name, GLuint index);
|
||||
typedef GLubyte const *(DP_APIENTRY * TglGetStringiFn)(GLenum name, GLuint index);
|
||||
|
||||
TglClearColorFn glClearColorFn = nullptr;
|
||||
TglClearFn glClearFn = nullptr;
|
||||
@@ -212,7 +204,7 @@ TglCheckFramebufferStatusFn glCheckFramebufferStatusFn = nullptr;
|
||||
TglGetStringiFn glGetStringiFn = nullptr;
|
||||
|
||||
#if !defined(GL_NUM_EXTENSIONS)
|
||||
#define GL_NUM_EXTENSIONS 0x821D
|
||||
#define GL_NUM_EXTENSIONS 0x821D
|
||||
#endif
|
||||
|
||||
std::mutex s_mutex;
|
||||
@@ -352,8 +344,7 @@ bool GLFunctions::glHasExtension(std::string const & name)
|
||||
glGetIntegerv(GL_NUM_EXTENSIONS, &n);
|
||||
for (GLint i = 0; i < n; i++)
|
||||
{
|
||||
std::string const extension =
|
||||
std::string(reinterpret_cast<char const *>(glGetStringiFn(GL_EXTENSIONS, i)));
|
||||
std::string const extension = std::string(reinterpret_cast<char const *>(glGetStringiFn(GL_EXTENSIONS, i)));
|
||||
if (extension == name)
|
||||
return true;
|
||||
}
|
||||
@@ -533,8 +524,8 @@ void GLFunctions::glDebugMessageCallback(TglDebugProc messageCallback, void * us
|
||||
GLCHECK(glDebugMessageCallbackFn(reinterpret_cast<GLDEBUGPROC>(messageCallback), userParam));
|
||||
}
|
||||
|
||||
void GLFunctions::glDebugMessageControl(glConst source, glConst type, glConst severity,
|
||||
int32_t count, uint32_t const * ids, uint8_t enabled)
|
||||
void GLFunctions::glDebugMessageControl(glConst source, glConst type, glConst severity, int32_t count,
|
||||
uint32_t const * ids, uint8_t enabled)
|
||||
{
|
||||
ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
|
||||
ASSERT(glDebugMessageControlFn != nullptr, ());
|
||||
@@ -627,8 +618,7 @@ void GLFunctions::glUnmapBuffer(glConst target)
|
||||
GLCHECKCALL();
|
||||
}
|
||||
|
||||
void * GLFunctions::glMapBufferRange(glConst target, uint32_t offset, uint32_t length,
|
||||
glConst access)
|
||||
void * GLFunctions::glMapBufferRange(glConst target, uint32_t offset, uint32_t length, glConst access)
|
||||
{
|
||||
ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
|
||||
ASSERT(glMapBufferRangeFn != nullptr, ());
|
||||
@@ -785,8 +775,8 @@ void GLFunctions::glEnableVertexAttribute(int attributeLocation)
|
||||
GLCHECK(glEnableVertexAttributeFn(attributeLocation));
|
||||
}
|
||||
|
||||
void GLFunctions::glVertexAttributePointer(int attrLocation, uint32_t count, glConst type,
|
||||
bool needNormalize, uint32_t stride, uint32_t offset)
|
||||
void GLFunctions::glVertexAttributePointer(int attrLocation, uint32_t count, glConst type, bool needNormalize,
|
||||
uint32_t stride, uint32_t offset)
|
||||
{
|
||||
ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
|
||||
ASSERT(glVertexAttributePointerFn != nullptr, ());
|
||||
@@ -794,14 +784,13 @@ void GLFunctions::glVertexAttributePointer(int attrLocation, uint32_t count, glC
|
||||
reinterpret_cast<void *>(offset)));
|
||||
}
|
||||
|
||||
void GLFunctions::glGetActiveUniform(uint32_t programID, uint32_t uniformIndex,
|
||||
int32_t * uniformSize, glConst * type, std::string & name)
|
||||
void GLFunctions::glGetActiveUniform(uint32_t programID, uint32_t uniformIndex, int32_t * uniformSize, glConst * type,
|
||||
std::string & name)
|
||||
{
|
||||
ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
|
||||
ASSERT(glGetActiveUniformFn != nullptr, ());
|
||||
GLchar buff[256];
|
||||
GLCHECK(glGetActiveUniformFn(programID, uniformIndex, ARRAY_SIZE(buff), nullptr, uniformSize,
|
||||
type, buff));
|
||||
GLCHECK(glGetActiveUniformFn(programID, uniformIndex, ARRAY_SIZE(buff), nullptr, uniformSize, type, buff));
|
||||
name = buff;
|
||||
}
|
||||
|
||||
@@ -948,8 +937,7 @@ void GLFunctions::glBindTexture(uint32_t textureID)
|
||||
GLCHECK(::glBindTexture(GL_TEXTURE_2D, textureID));
|
||||
}
|
||||
|
||||
void GLFunctions::glTexImage2D(int width, int height, glConst layout, glConst pixelType,
|
||||
void const * data)
|
||||
void GLFunctions::glTexImage2D(int width, int height, glConst layout, glConst pixelType, void const * data)
|
||||
{
|
||||
ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
|
||||
// In OpenGL ES3:
|
||||
@@ -983,12 +971,11 @@ void GLFunctions::glTexImage2D(int width, int height, glConst layout, glConst pi
|
||||
}
|
||||
}
|
||||
|
||||
GLCHECK(::glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, width, height,
|
||||
0, layout, pixelType, data));
|
||||
GLCHECK(::glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, width, height, 0, layout, pixelType, data));
|
||||
}
|
||||
|
||||
void GLFunctions::glTexSubImage2D(int x, int y, int width, int height, glConst layout,
|
||||
glConst pixelType, void const * data)
|
||||
void GLFunctions::glTexSubImage2D(int x, int y, int width, int height, glConst layout, glConst pixelType,
|
||||
void const * data)
|
||||
{
|
||||
ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
|
||||
GLCHECK(::glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, layout, pixelType, data));
|
||||
@@ -1000,12 +987,10 @@ void GLFunctions::glTexParameter(glConst param, glConst value)
|
||||
GLCHECK(::glTexParameteri(GL_TEXTURE_2D, param, value));
|
||||
}
|
||||
|
||||
void GLFunctions::glDrawElements(glConst primitive, uint32_t sizeOfIndex, uint32_t indexCount,
|
||||
uint32_t startIndex)
|
||||
void GLFunctions::glDrawElements(glConst primitive, uint32_t sizeOfIndex, uint32_t indexCount, uint32_t startIndex)
|
||||
{
|
||||
ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
|
||||
GLCHECK(::glDrawElements(primitive, indexCount,
|
||||
sizeOfIndex == sizeof(uint32_t) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT,
|
||||
GLCHECK(::glDrawElements(primitive, indexCount, sizeOfIndex == sizeof(uint32_t) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT,
|
||||
reinterpret_cast<GLvoid *>(startIndex * sizeOfIndex)));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user