chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disallow variable-length arrays and turn on -Wpedantic in Clang and GCC.

Browse Source 
PiperOrigin-RevId: 562832747
Change-Id: I0532624cee31e089a47426305d885687eb0fc5c5
This commit is contained in:
Saran Tunyasuvunakool
2023-09-05 11:04:12 -07:00
committed by Copybara-Service
parent 8ffdee355a
commit 329ed193ac
17 changed files with 121 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/render/glad/glad.c
+13 -4
View File
@@ -36,6 +36,11 @@
// Online:
// https://glad.dav1d.de/#profile=compatibility&language=c&specification=gl&loader=on&api=gl%3D1.5&extensions=GL_ARB_framebuffer_object&extensions=GL_ARB_seamless_cube_map&extensions=GL_ARB_vertex_buffer_object&extensions=GL_KHR_debug
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#endif
#if !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__APPLE__) && \
!defined(__HAIKU__) && !defined(_GNU_SOURCE)
#define _GNU_SOURCE
@@ -1471,12 +1476,12 @@ static void mjGlad_find_coreGL(void) {
}
}
int mjGladLoadGLUnsafe() {
if(mjGlad_open_gl()) {
int mjGladLoadGLUnsafe(void) {
if (mjGlad_open_gl()) {
mjGLVersion.major = 0; mjGLVersion.minor = 0;
glGetString = (PFNGLGETSTRINGPROC)mjGlad_get_proc("glGetString");
if(glGetString == NULL) return 0;
if(glGetString(GL_VERSION) == NULL) return 0;
if (glGetString == NULL) return 0;
if (glGetString(GL_VERSION) == NULL) return 0;
mjGlad_find_coreGL();
mjGlad_load_GL_VERSION_1_0(mjGlad_get_proc);
mjGlad_load_GL_VERSION_1_1(mjGlad_get_proc);
@@ -1496,3 +1501,7 @@ int mjGladLoadGLUnsafe() {
return 0;
}
}
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic pop
#endif
src/render/render_context.c
+2 -2
View File
@@ -140,7 +140,7 @@ static void makePlane(const mjModel* m, mjrContext* con) {
// record
grid[k][x] = left;
grid[k][x+1] = mjMAX(left, right); // just in case
grid[k][x+1] = mjMAX(left, right); // just in case
}
}
@@ -1458,7 +1458,7 @@ void GLAPIENTRY debugCallback(GLenum source,
// returns 1 if MUJOCO_GL_DEBUG environment variable is set to 1
static int glDebugEnabled() {
static int glDebugEnabled(void) {
char* debug = getenv("MUJOCO_GL_DEBUG");
return debug && strcmp(debug, "1") == 0;
}