diff --git a/libobs-opengl/gl-helpers.h b/libobs-opengl/gl-helpers.h index 82de9fbae..10a1c9f08 100644 --- a/libobs-opengl/gl-helpers.h +++ b/libobs-opengl/gl-helpers.h @@ -78,8 +78,8 @@ static inline bool gl_success(const char *funcname) --attempts; if (attempts == 0) { - blog(LOG_ERROR, "Too many GL errors, moving on", - funcname, errorcode); + blog(LOG_ERROR, + "Too many GL errors, moving on"); break; } } while (errorcode != GL_NO_ERROR); diff --git a/libobs-opengl/gl-subsystem.c b/libobs-opengl/gl-subsystem.c index 27966c7e1..e9c986fb0 100644 --- a/libobs-opengl/gl-subsystem.c +++ b/libobs-opengl/gl-subsystem.c @@ -388,6 +388,8 @@ device_samplerstate_create(gs_device_t *device, gs_timer_t *device_timer_create(gs_device_t *device) { + UNUSED_PARAMETER(device); + struct gs_timer *timer; GLuint queries[2]; @@ -404,6 +406,8 @@ gs_timer_t *device_timer_create(gs_device_t *device) gs_timer_range_t *device_timer_range_create(gs_device_t *device) { + UNUSED_PARAMETER(device); + return NULL; } @@ -1504,15 +1508,26 @@ bool gs_timer_get_data(gs_timer_t *timer, uint64_t *ticks) return true; } -void gs_timer_range_destroy(gs_timer_range_t *range) {} +void gs_timer_range_destroy(gs_timer_range_t *range) +{ + UNUSED_PARAMETER(range); +} -void gs_timer_range_begin(gs_timer_range_t *range) {} +void gs_timer_range_begin(gs_timer_range_t *range) +{ + UNUSED_PARAMETER(range); +} -void gs_timer_range_end(gs_timer_range_t *range) {} +void gs_timer_range_end(gs_timer_range_t *range) +{ + UNUSED_PARAMETER(range); +} bool gs_timer_range_get_data(gs_timer_range_t *range, bool *disjoint, uint64_t *frequency) { + UNUSED_PARAMETER(range); + *disjoint = false; *frequency = 1000000000; return true;