From afbd3947071a33f59dda122f1ac396442a02c128 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 10 Oct 2011 07:52:38 +0200 Subject: fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011 --- mesalib/src/glsl/ast_to_hir.cpp | 3 +-- mesalib/src/glsl/ir.cpp | 8 -------- mesalib/src/glsl/ir.h | 8 -------- 3 files changed, 1 insertion(+), 18 deletions(-) (limited to 'mesalib/src/glsl') diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp index 4f8a5482b..70afb67df 100644 --- a/mesalib/src/glsl/ast_to_hir.cpp +++ b/mesalib/src/glsl/ast_to_hir.cpp @@ -2803,8 +2803,7 @@ ast_declarator_list::hir(exec_list *instructions, _mesa_glsl_error(& loc, state, "identifier `%s' uses reserved `gl_' prefix", decl->identifier); - else if (state->language_version >= 130 && - strstr(decl->identifier, "__")) { + else if (strstr(decl->identifier, "__")) { /* From page 14 (page 20 of the PDF) of the GLSL 1.10 * spec: * diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp index d6594cd9a..d968890a2 100644 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp @@ -1353,14 +1353,6 @@ ir_variable::interpolation_string() const } -unsigned -ir_variable::component_slots() const -{ - /* FINISHME: Sparsely accessed arrays require fewer slots. */ - return this->type->component_slots(); -} - - ir_function_signature::ir_function_signature(const glsl_type *return_type) : return_type(return_type), is_defined(false), _function(NULL) { diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h index cc4e68002..b707634ea 100644 --- a/mesalib/src/glsl/ir.h +++ b/mesalib/src/glsl/ir.h @@ -292,14 +292,6 @@ public: */ const char *interpolation_string() const; - /** - * Calculate the number of slots required to hold this variable - * - * This is used to determine how many uniform or varying locations a variable - * occupies. The count is in units of floating point components. - */ - unsigned component_slots() const; - /** * Delcared name of the variable */ -- cgit v1.2.3