Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/MesaLib/dist/src merge mesa 18.3.6.
details: https://anonhg.NetBSD.org/xsrc/rev/73bba2affc83
branches: trunk
changeset: 10297:73bba2affc83
user: mrg <mrg%NetBSD.org@localhost>
date: Sat Jun 01 07:53:00 2019 +0000
description:
merge mesa 18.3.6.
diffstat:
external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c | 1 +
external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.c | 981 ++++-----
external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.h | 9 +-
3 files changed, 495 insertions(+), 496 deletions(-)
diffs (truncated from 2733 to 300 lines):
diff -r 38311e447c39 -r 73bba2affc83 external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c
--- a/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c Sat Jun 01 07:40:52 2019 +0000
+++ b/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c Sat Jun 01 07:53:00 2019 +0000
@@ -777,6 +777,7 @@
.num_subslices = { 2, },
.num_eu_per_subslice = 6,
.l3_banks = 2,
+ .urb.size = 192,
.simulator_id = 24,
};
static const struct gen_device_info gen_device_info_cfl_gt2 = {
diff -r 38311e447c39 -r 73bba2affc83 external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.c
--- a/external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.c Sat Jun 01 07:40:52 2019 +0000
+++ b/external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.c Sat Jun 01 07:53:00 2019 +0000
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.1. */
+/* A Bison parser, made by GNU Bison 3.2. */
/* Bison implementation for Yacc-like parsers in C
@@ -40,11 +40,14 @@
define necessary library symbols; they are noted "INFRINGES ON
USER NAME SPACE" below. */
+/* Undocumented macros, especially those whose name start with YY_,
+ are private implementation details. Do not rely on them. */
+
/* Identify Bison output. */
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "3.1"
+#define YYBISON_VERSION "3.2"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -67,8 +70,8 @@
#define yynerrs _mesa_program_nerrs
-/* Copy the first part of user declarations. */
-#line 1 "./program/program_parse.y" /* yacc.c:339 */
+/* First part of user prologue. */
+#line 1 "./program/program_parse.y" /* yacc.c:338 */
/*
* Copyright © 2009 Intel Corporation
@@ -190,13 +193,16 @@
} \
} while(0)
-#line 194 "program/program_parse.tab.c" /* yacc.c:339 */
-
+#line 197 "program/program_parse.tab.c" /* yacc.c:338 */
# ifndef YY_NULLPTR
-# if defined __cplusplus && 201103L <= __cplusplus
-# define YY_NULLPTR nullptr
+# if defined __cplusplus
+# if 201103L <= __cplusplus
+# define YY_NULLPTR nullptr
+# else
+# define YY_NULLPTR 0
+# endif
# else
-# define YY_NULLPTR 0
+# define YY_NULLPTR ((void*)0)
# endif
# endif
@@ -337,7 +343,7 @@
union YYSTYPE
{
-#line 129 "./program/program_parse.y" /* yacc.c:355 */
+#line 129 "./program/program_parse.y" /* yacc.c:353 */
struct asm_instruction *inst;
struct asm_symbol *sym;
@@ -363,7 +369,7 @@
unsigned negate:1;
} ext_swizzle;
-#line 367 "program/program_parse.tab.c" /* yacc.c:355 */
+#line 373 "program/program_parse.tab.c" /* yacc.c:353 */
};
typedef union YYSTYPE YYSTYPE;
@@ -391,8 +397,8 @@
#endif /* !YY__MESA_PROGRAM_PROGRAM_PROGRAM_PARSE_TAB_H_INCLUDED */
-/* Copy the second part of user declarations. */
-#line 271 "./program/program_parse.y" /* yacc.c:358 */
+/* Second part of user prologue. */
+#line 271 "./program/program_parse.y" /* yacc.c:355 */
extern int
_mesa_program_lexer_lex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
@@ -405,7 +411,7 @@
return _mesa_program_lexer_lex(yylval_param, yylloc_param, state->scanner);
}
-#line 409 "program/program_parse.tab.c" /* yacc.c:358 */
+#line 415 "program/program_parse.tab.c" /* yacc.c:355 */
#ifdef short
# undef short
@@ -480,15 +486,6 @@
# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
#endif
-#if !defined _Noreturn \
- && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-# define _Noreturn __declspec (noreturn)
-# else
-# define _Noreturn YY_ATTRIBUTE ((__noreturn__))
-# endif
-#endif
-
/* Suppress unused-variable warnings by "using" E. */
#if ! defined lint || defined __GNUC__
# define YYUSE(E) ((void) (E))
@@ -1268,10 +1265,10 @@
/* Print *YYLOCP on YYO. Private, do not rely on its existence. */
YY_ATTRIBUTE_UNUSED
-static unsigned
+static int
yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp)
{
- unsigned res = 0;
+ int res = 0;
int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0;
if (0 <= yylocp->first_line)
{
@@ -1314,41 +1311,41 @@
} while (0)
-/*----------------------------------------.
-| Print this symbol's value on YYOUTPUT. |
-`----------------------------------------*/
+/*-----------------------------------.
+| Print this symbol's value on YYO. |
+`-----------------------------------*/
static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct asm_parser_state *state)
+yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct asm_parser_state *state)
{
- FILE *yyo = yyoutput;
- YYUSE (yyo);
+ FILE *yyoutput = yyo;
+ YYUSE (yyoutput);
YYUSE (yylocationp);
YYUSE (state);
if (!yyvaluep)
return;
# ifdef YYPRINT
if (yytype < YYNTOKENS)
- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+ YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
# endif
YYUSE (yytype);
}
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
+/*---------------------------.
+| Print this symbol on YYO. |
+`---------------------------*/
static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct asm_parser_state *state)
+yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct asm_parser_state *state)
{
- YYFPRINTF (yyoutput, "%s %s (",
+ YYFPRINTF (yyo, "%s %s (",
yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
- YY_LOCATION_PRINT (yyoutput, *yylocationp);
- YYFPRINTF (yyoutput, ": ");
- yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, state);
- YYFPRINTF (yyoutput, ")");
+ YY_LOCATION_PRINT (yyo, *yylocationp);
+ YYFPRINTF (yyo, ": ");
+ yy_symbol_value_print (yyo, yytype, yyvaluep, yylocationp, state);
+ YYFPRINTF (yyo, ")");
}
/*------------------------------------------------------------------.
@@ -1515,7 +1512,7 @@
if (! yyres)
return yystrlen (yystr);
- return yystpcpy (yyres, yystr) - yyres;
+ return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
}
# endif
@@ -1783,12 +1780,12 @@
yyssp++;
yysetstate:
- *yyssp = yystate;
+ *yyssp = (yytype_int16) yystate;
if (yyss + yystacksize - 1 <= yyssp)
{
/* Get the current used size of the three stacks, in elements. */
- YYSIZE_T yysize = yyssp - yyss + 1;
+ YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
#ifdef yyoverflow
{
@@ -1808,10 +1805,9 @@
&yyvs1, yysize * sizeof (*yyvsp),
&yyls1, yysize * sizeof (*yylsp),
&yystacksize);
-
- yyls = yyls1;
yyss = yyss1;
yyvs = yyvs1;
+ yyls = yyls1;
}
#else /* no yyoverflow */
# ifndef YYSTACK_RELOCATE
@@ -1958,7 +1954,7 @@
switch (yyn)
{
case 3:
-#line 290 "./program/program_parse.y" /* yacc.c:1651 */
+#line 290 "./program/program_parse.y" /* yacc.c:1645 */
{
if (state->prog->Target != GL_VERTEX_PROGRAM_ARB) {
yyerror(& (yylsp[0]), state, "invalid fragment program header");
@@ -1966,11 +1962,11 @@
}
state->mode = ARB_vertex;
}
-#line 1970 "program/program_parse.tab.c" /* yacc.c:1651 */
+#line 1966 "program/program_parse.tab.c" /* yacc.c:1645 */
break;
case 4:
-#line 298 "./program/program_parse.y" /* yacc.c:1651 */
+#line 298 "./program/program_parse.y" /* yacc.c:1645 */
{
if (state->prog->Target != GL_FRAGMENT_PROGRAM_ARB) {
yyerror(& (yylsp[0]), state, "invalid vertex program header");
@@ -1980,11 +1976,11 @@
state->option.TexRect =
(state->ctx->Extensions.NV_texture_rectangle != GL_FALSE);
}
-#line 1984 "program/program_parse.tab.c" /* yacc.c:1651 */
+#line 1980 "program/program_parse.tab.c" /* yacc.c:1645 */
break;
case 7:
-#line 314 "./program/program_parse.y" /* yacc.c:1651 */
+#line 314 "./program/program_parse.y" /* yacc.c:1645 */
{
int valid = 0;
@@ -2006,11 +2002,11 @@
YYERROR;
}
}
-#line 2010 "program/program_parse.tab.c" /* yacc.c:1651 */
+#line 2006 "program/program_parse.tab.c" /* yacc.c:1645 */
break;
case 10:
-#line 342 "./program/program_parse.y" /* yacc.c:1651 */
+#line 342 "./program/program_parse.y" /* yacc.c:1645 */
{
if ((yyvsp[-1].inst) != NULL) {
if (state->inst_tail == NULL) {
@@ -2025,77 +2021,77 @@
state->prog->arb.NumInstructions++;
}
}
-#line 2029 "program/program_parse.tab.c" /* yacc.c:1651 */
+#line 2025 "program/program_parse.tab.c" /* yacc.c:1645 */
break;
case 12:
-#line 360 "./program/program_parse.y" /* yacc.c:1651 */
+#line 360 "./program/program_parse.y" /* yacc.c:1645 */
{
(yyval.inst) = (yyvsp[0].inst);
state->prog->arb.NumAluInstructions++;
}
-#line 2038 "program/program_parse.tab.c" /* yacc.c:1651 */
+#line 2034 "program/program_parse.tab.c" /* yacc.c:1645 */
break;
Home |
Main Index |
Thread Index |
Old Index