KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delete more vestiges of the old shader compiler.

This commit is contained in:
Kenneth Graunke 2010-08-20 13:06:02 -07:00
parent d6cc7191da
commit 7f80041efa
9 changed files with 0 additions and 1252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/glsl/apps/.gitignore vendored
View File

@ -1,5 +0,0 @@
compile
process
purify
tokenise
version

43
src/glsl/apps/Makefile
View File

@ -1,43 +0,0 @@
# src/glsl/apps/Makefile
TOP = ../../..
include $(TOP)/configs/current
LIBS = \
$(TOP)/src/glsl/pp/libglslpp.a \
$(TOP)/src/glsl/cl/libglslcl.a
SOURCES = \
compile.c \
process.c \
purify.c \
tokenise.c \
version.c
APPS = $(SOURCES:%.c=%)
INCLUDES = -I.
##### RULES #####
.SUFFIXES:
.SUFFIXES: .c
.c:
$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
.c.o:
$(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
##### TARGETS #####
default: $(APPS)
install:
clean:
-rm -f $(APPS)
-rm -f *.o

198
src/glsl/apps/compile.c
View File

@ -1,198 +0,0 @@
/**************************************************************************
*
* Copyright 2009 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "../pp/sl_pp_public.h"
#include "../pp/sl_pp_purify.h"
#include "../cl/sl_cl_parse.h"
static void
usage(void)
{
printf("Usage:\n");
printf(" compile fragment|vertex|geometry <source> <output>\n");
}
int
main(int argc,
char *argv[])
{
FILE *in;
long size;
char *inbuf;
struct sl_pp_purify_options options;
char errmsg[100] = "";
struct sl_pp_context *context;
unsigned int version;
FILE *out;
unsigned char *outbytes;
unsigned int cboutbytes;
unsigned int shader_type;
if (argc != 4) {
usage();
return 1;
}
if (!strcmp(argv[1], "fragment")) {
shader_type = 1;
} else if (!strcmp(argv[1], "vertex")) {
shader_type = 2;
} else if (!strcmp(argv[1], "geometry")) {
shader_type = 3;
} else {
usage();
return 1;
}
in = fopen(argv[2], "rb");
if (!in) {
printf("Could not open `%s' for read.\n", argv[2]);
usage();
return 1;
}
fseek(in, 0, SEEK_END);
size = ftell(in);
assert(size != -1);
if (size == -1) {
return 1;
}
fseek(in, 0, SEEK_SET);
out = fopen(argv[3], "w");
if (!out) {
fclose(in);
printf("Could not open `%s' for write.\n", argv[3]);
usage();
return 1;
}
inbuf = malloc(size + 1);
if (!inbuf) {
fprintf(out, "$OOMERROR\n");
fclose(out);
fclose(in);
printf("Out of memory.\n");
return 0;
}
if (fread(inbuf, 1, size, in) != size) {
fprintf(out, "$READERROR\n");
free(inbuf);
fclose(out);
fclose(in);
printf("Could not read from `%s'.\n", argv[2]);
return 0;
}
inbuf[size] = '\0';
fclose(in);
memset(&options, 0, sizeof(options));
context = sl_pp_context_create(inbuf, &options);
if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(inbuf);
fclose(out);
printf("Could not create parse context.\n");
return 0;
}
if (sl_pp_version(context, &version)) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
printf("Error: %s\n", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(inbuf);
fclose(out);
return 0;
}
if (sl_pp_context_add_extension(context, "GL_ARB_draw_buffers") ||
sl_pp_context_add_extension(context, "GL_ARB_texture_rectangle")) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
printf("Error: %s\n", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(inbuf);
fclose(out);
return 0;
}
if (sl_cl_compile(context, shader_type, 1, &outbytes, &cboutbytes, errmsg, sizeof(errmsg)) == 0) {
unsigned int i;
unsigned int line = 0;
fprintf(out, "\n/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED FROM THE FOLLOWING FILE: */");
fprintf(out, "\n/* %s */", argv[2]);
fprintf(out, "\n\n");
for (i = 0; i < cboutbytes; i++) {
unsigned int a;
if (outbytes[i] < 10) {
a = 1;
} else if (outbytes[i] < 100) {
a = 2;
} else {
a = 3;
}
if (i < cboutbytes - 1) {
a++;
}
if (line + a >= 100) {
fprintf (out, "\n");
line = 0;
}
line += a;
fprintf (out, "%u", outbytes[i]);
if (i < cboutbytes - 1) {
fprintf (out, ",");
}
}
fprintf (out, "\n");
free(outbytes);
} else {
fprintf(out, "$SYNTAXERROR: `%s'\n", errmsg);
printf("Error: %s\n", errmsg);
}
sl_pp_context_destroy(context);
free(inbuf);
fclose(out);
return 0;
}

388
src/glsl/apps/process.c
View File

@ -1,388 +0,0 @@
/**************************************************************************
*
* Copyright 2009 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "../pp/sl_pp_public.h"
#include "../pp/sl_pp_purify.h"
#include "../pp/sl_pp_token.h"
int
main(int argc,
char *argv[])
{
FILE *in;
long size;
char *inbuf;
struct sl_pp_purify_options options;
struct sl_pp_context *context;
unsigned int version;
struct sl_pp_token_info *outtokens;
FILE *out;
unsigned int i;
if (argc != 3) {
printf("Usage: process infile outfile\n");
return 1;
}
in = fopen(argv[1], "rb");
if (!in) {
return 1;
}
fseek(in, 0, SEEK_END);
size = ftell(in);
assert(size != -1);
if (size == -1) {
return 1;
}
fseek(in, 0, SEEK_SET);
out = fopen(argv[2], "wb");
if (!out) {
fclose(in);
return 1;
}
inbuf = malloc(size + 1);
if (!inbuf) {
fprintf(out, "$OOMERROR\n");
fclose(out);
fclose(in);
return 1;
}
if (fread(inbuf, 1, size, in) != size) {
fprintf(out, "$READERROR\n");
free(inbuf);
fclose(out);
fclose(in);
return 1;
}
inbuf[size] = '\0';
fclose(in);
memset(&options, 0, sizeof(options));
context = sl_pp_context_create(inbuf, &options);
if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(inbuf);
fclose(out);
return 1;
}
if (sl_pp_version(context, &version)) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(inbuf);
fclose(out);
return -1;
}
if (sl_pp_context_add_extension(context, "GL_ARB_draw_buffers") ||
sl_pp_context_add_extension(context, "GL_ARB_texture_rectangle")) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
printf("Error: %s\n", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(inbuf);
fclose(out);
return 0;
}
if (sl_pp_context_add_predefined(context, "__GLSL_PP_PREDEFINED_MACRO_TEST", "1")) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
printf("Error: %s\n", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(inbuf);
fclose(out);
return 0;
}
if (sl_pp_process(context, &outtokens)) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(inbuf);
fclose(out);
return -1;
}
free(inbuf);
for (i = 0; outtokens[i].token != SL_PP_EOF; i++) {
switch (outtokens[i].token) {
case SL_PP_NEWLINE:
fprintf(out, "\n");
break;
case SL_PP_COMMA:
fprintf(out, ", ");
break;
case SL_PP_SEMICOLON:
fprintf(out, "; ");
break;
case SL_PP_LBRACE:
fprintf(out, "{ ");
break;
case SL_PP_RBRACE:
fprintf(out, "} ");
break;
case SL_PP_LPAREN:
fprintf(out, "( ");
break;
case SL_PP_RPAREN:
fprintf(out, ") ");
break;
case SL_PP_LBRACKET:
fprintf(out, "[ ");
break;
case SL_PP_RBRACKET:
fprintf(out, "] ");
break;
case SL_PP_DOT:
fprintf(out, ". ");
break;
case SL_PP_INCREMENT:
fprintf(out, "++ ");
break;
case SL_PP_ADDASSIGN:
fprintf(out, "+= ");
break;
case SL_PP_PLUS:
fprintf(out, "+ ");
break;
case SL_PP_DECREMENT:
fprintf(out, "-- ");
break;
case SL_PP_SUBASSIGN:
fprintf(out, "-= ");
break;
case SL_PP_MINUS:
fprintf(out, "- ");
break;
case SL_PP_BITNOT:
fprintf(out, "~ ");
break;
case SL_PP_NOTEQUAL:
fprintf(out, "!= ");
break;
case SL_PP_NOT:
fprintf(out, "! ");
break;
case SL_PP_MULASSIGN:
fprintf(out, "*= ");
break;
case SL_PP_STAR:
fprintf(out, "* ");
break;
case SL_PP_DIVASSIGN:
fprintf(out, "/= ");
break;
case SL_PP_SLASH:
fprintf(out, "/ ");
break;
case SL_PP_MODASSIGN:
fprintf(out, "%%= ");
break;
case SL_PP_MODULO:
fprintf(out, "%% ");
break;
case SL_PP_LSHIFTASSIGN:
fprintf(out, "<<= ");
break;
case SL_PP_LSHIFT:
fprintf(out, "<< ");
break;
case SL_PP_LESSEQUAL:
fprintf(out, "<= ");
break;
case SL_PP_LESS:
fprintf(out, "< ");
break;
case SL_PP_RSHIFTASSIGN:
fprintf(out, ">>= ");
break;
case SL_PP_RSHIFT:
fprintf(out, ">> ");
break;
case SL_PP_GREATEREQUAL:
fprintf(out, ">= ");
break;
case SL_PP_GREATER:
fprintf(out, "> ");
break;
case SL_PP_EQUAL:
fprintf(out, "== ");
break;
case SL_PP_ASSIGN:
fprintf(out, "= ");
break;
case SL_PP_AND:
fprintf(out, "&& ");
break;
case SL_PP_BITANDASSIGN:
fprintf(out, "&= ");
break;
case SL_PP_BITAND:
fprintf(out, "& ");
break;
case SL_PP_XOR:
fprintf(out, "^^ ");
break;
case SL_PP_BITXORASSIGN:
fprintf(out, "^= ");
break;
case SL_PP_BITXOR:
fprintf(out, "^ ");
break;
case SL_PP_OR:
fprintf(out, "|| ");
break;
case SL_PP_BITORASSIGN:
fprintf(out, "|= ");
break;
case SL_PP_BITOR:
fprintf(out, "| ");
break;
case SL_PP_QUESTION:
fprintf(out, "? ");
break;
case SL_PP_COLON:
fprintf(out, ": ");
break;
case SL_PP_IDENTIFIER:
fprintf(out, "%s ", sl_pp_context_cstr(context, outtokens[i].data.identifier));
break;
case SL_PP_UINT:
fprintf(out, "%s ", sl_pp_context_cstr(context, outtokens[i].data._uint));
break;
case SL_PP_FLOAT:
fprintf(out, "%s ", sl_pp_context_cstr(context, outtokens[i].data._float));
break;
case SL_PP_OTHER:
fprintf(out, "%c", outtokens[i].data.other);
break;
case SL_PP_PRAGMA_OPTIMIZE:
fprintf(out, "#pragma optimize(%s)", outtokens[i].data.pragma ? "on" : "off");
break;
case SL_PP_PRAGMA_DEBUG:
fprintf(out, "#pragma debug(%s)", outtokens[i].data.pragma ? "on" : "off");
break;
case SL_PP_EXTENSION_REQUIRE:
fprintf(out, "#extension %s : require", sl_pp_context_cstr(context, outtokens[i].data.extension));
break;
case SL_PP_EXTENSION_ENABLE:
fprintf(out, "#extension %s : enable", sl_pp_context_cstr(context, outtokens[i].data.extension));
break;
case SL_PP_EXTENSION_WARN:
fprintf(out, "#extension %s : warn", sl_pp_context_cstr(context, outtokens[i].data.extension));
break;
case SL_PP_EXTENSION_DISABLE:
fprintf(out, "#extension %s : disable", sl_pp_context_cstr(context, outtokens[i].data.extension));
break;
case SL_PP_LINE:
fprintf(out, "#line %u %u", outtokens[i].data.line.lineno, outtokens[i].data.line.fileno);
break;
default:
assert(0);
}
}
sl_pp_context_destroy(context);
free(outtokens);
fclose(out);
return 0;
}

112
src/glsl/apps/purify.c
View File

@ -1,112 +0,0 @@
/**************************************************************************
*
* Copyright 2009 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "../pp/sl_pp_public.h"
#include "../pp/sl_pp_purify.h"
int
main(int argc,
char *argv[])
{
FILE *in;
long size;
char *inbuf;
struct sl_pp_purify_options options;
char *outbuf;
char errmsg[100] = "";
unsigned int errline = 0;
FILE *out;
if (argc != 3) {
printf("Usage: purify infile outfile\n");
return 1;
}
in = fopen(argv[1], "rb");
if (!in) {
return 1;
}
fseek(in, 0, SEEK_END);
size = ftell(in);
assert(size != -1);
if (size == -1) {
return 1;
}
fseek(in, 0, SEEK_SET);
out = fopen(argv[2], "wb");
if (!out) {
fclose(in);
return 1;
}
inbuf = malloc(size + 1);
if (!inbuf) {
fprintf(out, "$OOMERROR\n");
fclose(out);
fclose(in);
return 1;
}
if (fread(inbuf, 1, size, in) != size) {
fprintf(out, "$READERROR\n");
free(inbuf);
fclose(out);
fclose(in);
return 1;
}
inbuf[size] = '\0';
fclose(in);
memset(&options, 0, sizeof(options));
if (sl_pp_purify(inbuf, &options, &outbuf, errmsg, sizeof(errmsg), &errline)) {
fprintf(out, "$PURIFYERROR %u: %s\n", errline, errmsg);
free(inbuf);
fclose(out);
return 1;
}
free(inbuf);
fwrite(outbuf, 1, strlen(outbuf), out);
free(outbuf);
fclose(out);
return 0;
}

340
src/glsl/apps/tokenise.c
View File

@ -1,340 +0,0 @@
/**************************************************************************
*
* Copyright 2009 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "../pp/sl_pp_public.h"
#include "../pp/sl_pp_purify.h"
#include "../pp/sl_pp_token.h"
int
main(int argc,
char *argv[])
{
FILE *in;
long size;
char *inbuf;
struct sl_pp_purify_options options;
struct sl_pp_context *context;
struct sl_pp_token_info *tokens;
FILE *out;
unsigned int i;
if (argc != 3) {
printf("Usage: tokenize infile outfile\n");
return 1;
}
in = fopen(argv[1], "rb");
if (!in) {
return 1;
}
fseek(in, 0, SEEK_END);
size = ftell(in);
assert(size != -1);
if (size == -1) {
return 1;
}
fseek(in, 0, SEEK_SET);
out = fopen(argv[2], "wb");
if (!out) {
fclose(in);
return 1;
}
inbuf = malloc(size + 1);
if (!inbuf) {
fprintf(out, "$OOMERROR\n");
fclose(out);
fclose(in);
return 1;
}
if (fread(inbuf, 1, size, in) != size) {
fprintf(out, "$READERROR\n");
free(inbuf);
fclose(out);
fclose(in);
return 1;
}
inbuf[size] = '\0';
fclose(in);
memset(&options, 0, sizeof(options));
context = sl_pp_context_create(inbuf, &options);
if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(inbuf);
fclose(out);
return 1;
}
if (sl_pp_tokenise(context, &tokens)) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(inbuf);
fclose(out);
return 1;
}
free(inbuf);
for (i = 0; tokens[i].token != SL_PP_EOF; i++) {
switch (tokens[i].token) {
case SL_PP_WHITESPACE:
break;
case SL_PP_NEWLINE:
fprintf(out, "\n");
break;
case SL_PP_HASH:
fprintf(out, "# ");
break;
case SL_PP_COMMA:
fprintf(out, ", ");
break;
case SL_PP_SEMICOLON:
fprintf(out, "; ");
break;
case SL_PP_LBRACE:
fprintf(out, "{ ");
break;
case SL_PP_RBRACE:
fprintf(out, "} ");
break;
case SL_PP_LPAREN:
fprintf(out, "( ");
break;
case SL_PP_RPAREN:
fprintf(out, ") ");
break;
case SL_PP_LBRACKET:
fprintf(out, "[ ");
break;
case SL_PP_RBRACKET:
fprintf(out, "] ");
break;
case SL_PP_DOT:
fprintf(out, ". ");
break;
case SL_PP_INCREMENT:
fprintf(out, "++ ");
break;
case SL_PP_ADDASSIGN:
fprintf(out, "+= ");
break;
case SL_PP_PLUS:
fprintf(out, "+ ");
break;
case SL_PP_DECREMENT:
fprintf(out, "-- ");
break;
case SL_PP_SUBASSIGN:
fprintf(out, "-= ");
break;
case SL_PP_MINUS:
fprintf(out, "- ");
break;
case SL_PP_BITNOT:
fprintf(out, "~ ");
break;
case SL_PP_NOTEQUAL:
fprintf(out, "!= ");
break;
case SL_PP_NOT:
fprintf(out, "! ");
break;
case SL_PP_MULASSIGN:
fprintf(out, "*= ");
break;
case SL_PP_STAR:
fprintf(out, "* ");
break;
case SL_PP_DIVASSIGN:
fprintf(out, "/= ");
break;
case SL_PP_SLASH:
fprintf(out, "/ ");
break;
case SL_PP_MODASSIGN:
fprintf(out, "%%= ");
break;
case SL_PP_MODULO:
fprintf(out, "%% ");
break;
case SL_PP_LSHIFTASSIGN:
fprintf(out, "<<= ");
break;
case SL_PP_LSHIFT:
fprintf(out, "<< ");
break;
case SL_PP_LESSEQUAL:
fprintf(out, "<= ");
break;
case SL_PP_LESS:
fprintf(out, "< ");
break;
case SL_PP_RSHIFTASSIGN:
fprintf(out, ">>= ");
break;
case SL_PP_RSHIFT:
fprintf(out, ">> ");
break;
case SL_PP_GREATEREQUAL:
fprintf(out, ">= ");
break;
case SL_PP_GREATER:
fprintf(out, "> ");
break;
case SL_PP_EQUAL:
fprintf(out, "== ");
break;
case SL_PP_ASSIGN:
fprintf(out, "= ");
break;
case SL_PP_AND:
fprintf(out, "&& ");
break;
case SL_PP_BITANDASSIGN:
fprintf(out, "&= ");
break;
case SL_PP_BITAND:
fprintf(out, "& ");
break;
case SL_PP_XOR:
fprintf(out, "^^ ");
break;
case SL_PP_BITXORASSIGN:
fprintf(out, "^= ");
break;
case SL_PP_BITXOR:
fprintf(out, "^ ");
break;
case SL_PP_OR:
fprintf(out, "|| ");
break;
case SL_PP_BITORASSIGN:
fprintf(out, "|= ");
break;
case SL_PP_BITOR:
fprintf(out, "| ");
break;
case SL_PP_QUESTION:
fprintf(out, "? ");
break;
case SL_PP_COLON:
fprintf(out, ": ");
break;
case SL_PP_IDENTIFIER:
fprintf(out, "%s ", sl_pp_context_cstr(context, tokens[i].data.identifier));
break;
case SL_PP_UINT:
fprintf(out, "(%s) ", sl_pp_context_cstr(context, tokens[i].data._uint));
break;
case SL_PP_FLOAT:
fprintf(out, "(%s) ", sl_pp_context_cstr(context, tokens[i].data._float));
break;
case SL_PP_OTHER:
if (tokens[i].data.other == '\'') {
fprintf(out, "'\\'' ");
} else {
fprintf(out, "'%c' ", tokens[i].data.other);
}
break;
default:
assert(0);
}
}
sl_pp_context_destroy(context);
free(tokens);
fclose(out);
return 0;
}

121
src/glsl/apps/version.c
View File

@ -1,121 +0,0 @@
/**************************************************************************
*
* Copyright 2009 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "../pp/sl_pp_public.h"
#include "../pp/sl_pp_purify.h"
int
main(int argc,
char *argv[])
{
FILE *in;
long size;
char *inbuf;
struct sl_pp_purify_options options;
struct sl_pp_context *context;
unsigned int version;
FILE *out;
if (argc != 3) {
printf("Usage: version infile outfile\n");
return 1;
}
in = fopen(argv[1], "rb");
if (!in) {
return 1;
}
fseek(in, 0, SEEK_END);
size = ftell(in);
assert(size != -1);
if (size == -1) {
return 1;
}
fseek(in, 0, SEEK_SET);
out = fopen(argv[2], "wb");
if (!out) {
fclose(in);
return 1;
}
inbuf = malloc(size + 1);
if (!inbuf) {
fprintf(out, "$OOMERROR\n");
fclose(out);
fclose(in);
return 1;
}
if (fread(inbuf, 1, size, in) != size) {
fprintf(out, "$READERROR\n");
free(inbuf);
fclose(out);
fclose(in);
return 1;
}
inbuf[size] = '\0';
fclose(in);
memset(&options, 0, sizeof(options));
context = sl_pp_context_create(inbuf, &options);
if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(inbuf);
fclose(out);
return 1;
}
if (sl_pp_version(context, &version)) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(inbuf);
fclose(out);
return -1;
}
sl_pp_context_destroy(context);
free(inbuf);
fprintf(out, "%u\n", version);
fclose(out);
return 0;
}

24
src/mesa/SConscript
View File

@ -227,28 +227,6 @@ if env['platform'] != 'winddk':
'program/symbol_table.c',
]
slang_sources = [
'slang/slang_builtin.c',
'slang/slang_codegen.c',
'slang/slang_compile.c',
'slang/slang_compile_function.c',
'slang/slang_compile_operation.c',
'slang/slang_compile_struct.c',
'slang/slang_compile_variable.c',
'slang/slang_emit.c',
'slang/slang_ir.c',
'slang/slang_label.c',
'slang/slang_link.c',
'slang/slang_log.c',
'slang/slang_mem.c',
'slang/slang_print.c',
'slang/slang_simplify.c',
'slang/slang_storage.c',
'slang/slang_typeinfo.c',
'slang/slang_vartable.c',
'slang/slang_utility.c',
]
mesa_sources = (
main_sources +
math_sources +
@ -333,8 +311,6 @@ if env['platform'] != 'winddk':
# build dir) to the include path
env.Append(CPPPATH = [matypes[0].dir])
#SConscript('slang/library/SConscript')
#
# Libraries
#

21
src/mesa/sources.mak
View File

@ -253,27 +253,6 @@ PROGRAM_SOURCES = \
SHADER_CXX_SOURCES = \
program/ir_to_mesa.cpp
SLANG_SOURCES = \
slang/slang_builtin.c \
slang/slang_codegen.c \
slang/slang_compile.c \
slang/slang_compile_function.c \
slang/slang_compile_operation.c \
slang/slang_compile_struct.c \
slang/slang_compile_variable.c \
slang/slang_emit.c \
slang/slang_ir.c \
slang/slang_label.c \
slang/slang_link.c \
slang/slang_log.c \
slang/slang_mem.c \
slang/slang_print.c \
slang/slang_simplify.c \
slang/slang_storage.c \
slang/slang_typeinfo.c \
slang/slang_vartable.c \
slang/slang_utility.c
ASM_C_SOURCES = \
x86/common_x86.c \
x86/x86_xform.c \