OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

progs/glsl: Silence compiler warnings.

Browse Source
This commit is contained in:
Vinson Lee
2009-12-29 21:11:37 -08:00
parent 70bbe22366
commit 0ab29d2b35
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
progs/glsl/shtest.c
View File

@@ -493,7 +493,9 @@ ReadConfigFile(const char *filename, struct config_file *conf)
/* ugly but functional parser */ /* ugly but functional parser */
while (!feof(f)) { while (!feof(f)) {
fgets(line, sizeof(line), f); char *result;
result = fgets(line, sizeof(line), f);
(void) result;
if (!feof(f) && line[0]) { if (!feof(f) && line[0]) {
if (strncmp(line, "vs ", 3) == 0) { if (strncmp(line, "vs ", 3) == 0) {
VertShaderFile = strdup(line + 3); VertShaderFile = strdup(line + 3);

9
progs/glsl/vert-tex.c
View File

@@ -40,15 +40,6 @@ static GLboolean Anim = GL_TRUE;
static GLboolean WireFrame = GL_TRUE; static GLboolean WireFrame = GL_TRUE;
static GLfloat xRot = -70.0f, yRot = 0.0f, zRot = 0.0f; static GLfloat xRot = -70.0f, yRot = 0.0f, zRot = 0.0f;
/* value[0] = tex unit */
static struct uniform_info Uniforms[] = {
{ "tex1", 1, GL_SAMPLER_2D, { 0, 0, 0, 0 }, -1 },
END_OF_UNIFORMS
};
static void static void
Idle(void) Idle(void)
{ {