aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Lobodzinski <mark@lunarg.com>2016-05-19 17:22:25 -0600
committerMark Lobodzinski <mark@lunarg.com>2016-05-20 08:28:11 -0600
commit4c62d0003eab6814c44a5092eb6e7a021344fd27 (patch)
tree058fb4607ab306a30bb427fbcdef706c0513a302
parent85032527c79b4158f2d33aefcf9eb4a8df358e60 (diff)
downloadusermoji-4c62d0003eab6814c44a5092eb6e7a021344fd27.tar.xz
demos: GH7, Fix invalid variable names
Change-Id: Iabb217f70d0068284c682d9da6b4c2834902256e
-rw-r--r--demos/cube.c8
-rw-r--r--demos/tri.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/demos/cube.c b/demos/cube.c
index 9b256ce7..082ed613 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -324,7 +324,7 @@ BreakCallback(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType,
return false;
}
-typedef struct _SwapchainBuffers {
+typedef struct {
VkImage image;
VkCommandBuffer cmd;
VkImageView view;
@@ -1023,8 +1023,8 @@ bool loadTexture(const char *filename, uint8_t *rgba_data,
#ifdef __ANDROID__
#include <lunarg.ppm.h>
char *cPtr;
- cPtr = (char*)___lunarg_ppm;
- if ((unsigned char*)cPtr >= (___lunarg_ppm + ___lunarg_ppm_len) || strncmp(cPtr, "P6\n", 3)) {
+ cPtr = (char*)lunarg_ppm;
+ if ((unsigned char*)cPtr >= (lunarg_ppm + lunarg_ppm_len) || strncmp(cPtr, "P6\n", 3)) {
return false;
}
while(strncmp(cPtr++, "\n", 1));
@@ -1033,7 +1033,7 @@ bool loadTexture(const char *filename, uint8_t *rgba_data,
return true;
}
while(strncmp(cPtr++, "\n", 1));
- if ((unsigned char*)cPtr >= (___lunarg_ppm + ___lunarg_ppm_len) || strncmp(cPtr, "255\n", 4)) {
+ if ((unsigned char*)cPtr >= (lunarg_ppm + lunarg_ppm_len) || strncmp(cPtr, "255\n", 4)) {
return false;
}
while(strncmp(cPtr++, "\n", 1));
diff --git a/demos/tri.c b/demos/tri.c
index 789ec2bd..441eddcb 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -170,7 +170,7 @@ BreakCallback(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType,
return false;
}
-typedef struct _SwapchainBuffers {
+typedef struct {
VkImage image;
VkCommandBuffer cmd;
VkImageView view;