mesa/src/compiler/glsl/glcpp/glcpp.c
Ilia Mirkin e483cb9a3a glsl: reuse main extension table to appropriately restrict extensions
Previously we were only restricting based on ES/non-ES-ness and whether
the overall enable bit had been flipped on. However we have been adding
more fine-grained restrictions, such as based on compat profiles, as
well as specific ES versions. Most of the time this doesn't matter, but
it can create awkward situations and duplication of logic.

Here we separate the main extension table into a separate object file,
linked to the glsl compiler, which makes use of it with a custom
function which takes the ES-ness of the shader into account (thus
allowing desktop shaders to properly use ES extensions that would
otherwise have been disallowed.) We can also now use this logic to
generate #define's for all supported extensions automatically, removing
the duplicate (and often inaccurate) list in glcpp.

The effect of this change should be nil in most cases. However in some
situations, extensions like GL_ARB_gpu_shader5 which were formerly
available in compat contexts on the GLSL side of things will now become
inaccessible.

This regresses two ES CTS tests:

  ES3-CTS.shaders.shader_integer_mix.define
  ES31-CTS.shader_integer_mix.define

however that is due to them using #version 100 instead of 300 es. As the
extension is only defined for ES3, I believe this is the correct
behavior.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> (v2)
v2 -> v3: integrate glcpp defines into the same mechanism
2016-07-23 13:48:04 -04:00

182 lines
4.3 KiB
C

/*
* Copyright © 2010 Intel Corporation
*
* 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, sublicense,
* 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 NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS 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 <string.h>
#include <errno.h>
#include <getopt.h>
#include "glcpp.h"
#include "main/mtypes.h"
#include "main/shaderobj.h"
#include "util/strtod.h"
extern int glcpp_parser_debug;
void
_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
struct gl_shader *sh)
{
(void) ctx;
*ptr = sh;
}
/* Read from fp until EOF and return a string of everything read.
*/
static char *
load_text_fp (void *ctx, FILE *fp)
{
#define CHUNK 4096
char *text = NULL;
size_t text_size = 0;
size_t total_read = 0;
size_t bytes;
while (1) {
if (total_read + CHUNK + 1 > text_size) {
text_size = text_size ? text_size * 2 : CHUNK + 1;
text = reralloc_size (ctx, text, text_size);
if (text == NULL) {
fprintf (stderr, "Out of memory\n");
return NULL;
}
}
bytes = fread (text + total_read, 1, CHUNK, fp);
total_read += bytes;
if (bytes < CHUNK) {
break;
}
}
text[total_read] = '\0';
return text;
}
static char *
load_text_file(void *ctx, const char *filename)
{
char *text;
FILE *fp;
if (filename == NULL || strcmp (filename, "-") == 0)
return load_text_fp (ctx, stdin);
fp = fopen (filename, "r");
if (fp == NULL) {
fprintf (stderr, "Failed to open file %s: %s\n",
filename, strerror (errno));
return NULL;
}
text = load_text_fp (ctx, fp);
fclose(fp);
return text;
}
/* Initialize only those things that glcpp cares about.
*/
static void
init_fake_gl_context (struct gl_context *gl_ctx)
{
gl_ctx->API = API_OPENGL_COMPAT;
gl_ctx->Const.DisableGLSLLineContinuations = false;
}
static void
usage (void)
{
fprintf (stderr,
"Usage: glcpp [OPTIONS] [--] [<filename>]\n"
"\n"
"Pre-process the given filename (stdin if no filename given).\n"
"The following options are supported:\n"
" --disable-line-continuations Do not interpret lines ending with a\n"
" backslash ('\\') as a line continuation.\n");
}
enum {
DISABLE_LINE_CONTINUATIONS_OPT = CHAR_MAX + 1
};
static const struct option
long_options[] = {
{"disable-line-continuations", no_argument, 0, DISABLE_LINE_CONTINUATIONS_OPT },
{"debug", no_argument, 0, 'd'},
{0, 0, 0, 0 }
};
int
main (int argc, char *argv[])
{
char *filename = NULL;
void *ctx = ralloc(NULL, void*);
char *info_log = ralloc_strdup(ctx, "");
const char *shader;
int ret;
struct gl_context gl_ctx;
int c;
init_fake_gl_context (&gl_ctx);
while ((c = getopt_long(argc, argv, "d", long_options, NULL)) != -1) {
switch (c) {
case DISABLE_LINE_CONTINUATIONS_OPT:
gl_ctx.Const.DisableGLSLLineContinuations = true;
break;
case 'd':
glcpp_parser_debug = 1;
break;
default:
usage ();
exit (1);
}
}
if (optind + 1 < argc) {
printf ("Unexpected argument: %s\n", argv[optind+1]);
usage ();
exit (1);
}
if (optind < argc) {
filename = argv[optind];
}
shader = load_text_file (ctx, filename);
if (shader == NULL)
return 1;
_mesa_locale_init();
ret = glcpp_preprocess(ctx, &shader, &info_log, NULL, NULL, &gl_ctx);
printf("%s", shader);
fprintf(stderr, "%s", info_log);
ralloc_free(ctx);
return ret;
}