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

Merge branch 'master' into asm-shader-rework-2

Browse Source 
Conflicts:
	src/mesa/shader/lex.yy.c
	src/mesa/shader/program_parse.tab.c
	src/mesa/shader/program_parse.tab.h
This commit is contained in:
Ian Romanick
2009-09-10 15:33:45 -07:00
parent 81722c5d7e d9dc4cb0e4
commit b8e1e8d2d8
306 changed files with 18852 additions and 10611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesa/shader/program_lexer.l
View File

@@ -23,6 +23,7 @@
*/
#include "main/glheader.h"
#include "prog_instruction.h"
#include "prog_statevars.h"
#include "symbol_table.h"
#include "program_parser.h"
@@ -35,6 +36,10 @@
#define require_rect (yyextra->option.TexRect)
#define require_texarray (yyextra->option.TexArray)
#ifndef HAVE_UNISTD_H
#define YY_NO_UNISTD_H
#endif
#define return_token_or_IDENTIFIER(condition, token) \
do { \
if (condition) { \
@@ -269,7 +274,7 @@ result { return RESULT; }
{dot}palette { return PALETTE; }
{dot}params { return PARAMS; }
{dot}plane { return PLANE; }
{dot}point { return_token_or_DOT(require_ARB_vp, POINT); }
{dot}point { return_token_or_DOT(require_ARB_vp, POINT_TOK); }
{dot}pointsize { return_token_or_DOT(require_ARB_vp, POINTSIZE); }
{dot}position { return POSITION; }
{dot}primary { return PRIMARY; }
@@ -279,7 +284,7 @@ result { return RESULT; }
{dot}scenecolor { return SCENECOLOR; }
{dot}secondary { return SECONDARY; }
{dot}shininess { return SHININESS; }
{dot}size { return_token_or_DOT(require_ARB_vp, SIZE); }
{dot}size { return_token_or_DOT(require_ARB_vp, SIZE_TOK); }
{dot}specular { return SPECULAR; }
{dot}spot { return SPOT; }
{dot}texcoord { return TEXCOORD; }