aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay <raysan5@gmail.com>2019-06-19 15:43:35 +0200
committerRay <raysan5@gmail.com>2019-06-19 15:43:35 +0200
commit1b249ac1e15b59867c6f9af3ff628cffba0840ee (patch)
tree4e86c89898ea2548e674204332501013322ecc19
parente0854696b4685737f21b0b2b973104c76c5bb8ef (diff)
downloadraylib-1b249ac1e15b59867c6f9af3ff628cffba0840ee.tar.gz
raylib-1b249ac1e15b59867c6f9af3ff628cffba0840ee.zip
Define some globals
-rw-r--r--src/core.c10
-rw-r--r--src/rlgl.h18
-rw-r--r--src/text.c2
-rw-r--r--src/utils.c2
4 files changed, 16 insertions, 16 deletions
diff --git a/src/core.c b/src/core.c
index da981fd0..00647ed9 100644
--- a/src/core.c
+++ b/src/core.c
@@ -301,7 +301,7 @@ static int renderOffsetX = 0; // Offset X from render area (mu
static int renderOffsetY = 0; // Offset Y from render area (must be divided by 2)
static bool fullscreen = false; // Fullscreen mode (useful only for PLATFORM_DESKTOP)
static bool alwaysRun = false; // Keep window update/draw running on minimized
-static Matrix screenScaling; // Matrix to scale screen (framebuffer rendering)
+static Matrix screenScaling = { 0 }; // Matrix to scale screen (framebuffer rendering)
#if defined(PLATFORM_RPI)
static EGL_DISPMANX_WINDOW_T nativeWindow; // Native window (graphic device)
@@ -312,7 +312,7 @@ static EGLDisplay display; // Native display device (physic
static EGLSurface surface; // Surface to draw on, framebuffers (connected to context)
static EGLContext context; // Graphic context, mode in which drawing can be done
static EGLConfig config; // Graphic config
-static uint64_t baseTime; // Base time measure for hi-res timer
+static uint64_t baseTime = 0; // Base time measure for hi-res timer
static bool windowShouldClose = false; // Flag to set window for closing
#endif
@@ -342,7 +342,7 @@ static int exitKey = KEY_ESCAPE; // Default exit key (ESC)
#if defined(PLATFORM_RPI)
// NOTE: For keyboard we will use the standard input (but reconfigured...)
static struct termios defaultKeyboardSettings; // Used to store default keyboard settings
-static int defaultKeyboardMode; // Used to store default keyboard mode
+static int defaultKeyboardMode = 0; // Used to store default keyboard mode
#endif
// Mouse states
@@ -384,8 +384,8 @@ typedef struct{
char Tail;
} KeyEventFifo;
-static KeyEventFifo lastKeyPressedEvdev; // Buffer for holding keydown events as they arrive (Needed due to multitreading of event workers)
-static char currentKeyStateEvdev[512] = { 0 }; // Registers current frame key state from event based driver (Needs to be seperate because the legacy console based method clears keys on every frame)
+static KeyEventFifo lastKeyPressedEvdev = { 0 }; // Buffer for holding keydown events as they arrive (Needed due to multitreading of event workers)
+static char currentKeyStateEvdev[512] = { 0 }; // Registers current frame key state from event based driver (Needs to be seperate because the legacy console based method clears keys on every frame)
#endif
#if defined(PLATFORM_WEB)
diff --git a/src/rlgl.h b/src/rlgl.h
index b2f1d0bc..1bc07185 100644
--- a/src/rlgl.h
+++ b/src/rlgl.h
@@ -782,14 +782,14 @@ static DrawCall *draws = NULL;
static int drawsCounter = 0;
// Default texture (1px white) useful for plain color polys (required by shader)
-static unsigned int defaultTextureId;
+static unsigned int defaultTextureId = 0;
// Default shaders
-static unsigned int defaultVShaderId; // Default vertex shader id (used by default shader program)
-static unsigned int defaultFShaderId; // Default fragment shader Id (used by default shader program)
+static unsigned int defaultVShaderId = 0; // Default vertex shader id (used by default shader program)
+static unsigned int defaultFShaderId = 0; // Default fragment shader Id (used by default shader program)
-static Shader defaultShader; // Basic shader, support vertex color and diffuse texture
-static Shader currentShader; // Shader to be used on rendering (by default, defaultShader)
+static Shader defaultShader = { 0 }; // Basic shader, support vertex color and diffuse texture
+static Shader currentShader = { 0 }; // Shader to be used on rendering (by default, defaultShader)
// Extension supported flag: VAO
static bool vaoSupported = false; // VAO support (OpenGL ES2 could not support VAO extension)
@@ -827,7 +827,7 @@ static PFNGLDELETEVERTEXARRAYSOESPROC glDeleteVertexArrays;
#if defined(SUPPORT_VR_SIMULATOR)
// VR global variables
static VrStereoConfig vrConfig = { 0 }; // VR stereo configuration for simulator
-static RenderTexture2D stereoFbo; // VR stereo rendering framebuffer
+static RenderTexture2D stereoFbo = { 0 }; // VR stereo rendering framebuffer
static bool vrSimulatorReady = false; // VR simulator ready flag
static bool vrStereoRender = false; // VR stereo rendering enabled/disabled flag
// NOTE: This flag is useful to render data over stereo image (i.e. FPS)
@@ -835,11 +835,11 @@ static bool vrStereoRender = false; // VR stereo rendering enabled/disab
#endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2
-static int blendMode = 0; // Track current blending mode
+static int blendMode = 0; // Track current blending mode
// Default framebuffer size
-static int screenWidth; // Default framebuffer width
-static int screenHeight; // Default framebuffer height
+static int screenWidth = 0; // Default framebuffer width
+static int screenHeight= 0; // Default framebuffer height
//----------------------------------------------------------------------------------
// Module specific Functions Declaration
diff --git a/src/text.c b/src/text.c
index 9a0bcb36..6b742fd2 100644
--- a/src/text.c
+++ b/src/text.c
@@ -74,7 +74,7 @@
// Global variables
//----------------------------------------------------------------------------------
#if defined(SUPPORT_DEFAULT_FONT)
-static Font defaultFont; // Default font provided by raylib
+static Font defaultFont = { 0 }; // Default font provided by raylib
// NOTE: defaultFont is loaded on InitWindow and disposed on CloseWindow [module: core]
#endif
diff --git a/src/utils.c b/src/utils.c
index ee4be46d..8aad9f44 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -62,7 +62,7 @@ static int logTypeExit = LOG_ERROR;
static TraceLogCallback logCallback = NULL;
#if defined(PLATFORM_ANDROID)
-AAssetManager *assetManager;
+AAssetManager *assetManager = NULL;
#endif
//----------------------------------------------------------------------------------