Mesa (glsl2): ir_to_mesa: Give the expected size for _mesa_add_attribute().
Eric Anholt
anholt at kemper.freedesktop.org
Fri Aug 6 07:53:20 UTC 2010
Module: Mesa
Branch: glsl2
Commit: 658e25987fbec3b826f500baa6d4d936b9552b13
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=658e25987fbec3b826f500baa6d4d936b9552b13
Author: Eric Anholt <eric at anholt.net>
Date: Thu Aug 5 15:54:56 2010 -0700
ir_to_mesa: Give the expected size for _mesa_add_attribute().
Fixes a failure in glean shaderAPI.
---
src/mesa/program/ir_to_mesa.cpp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index f5e5f7d..9979e6e 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -43,6 +43,7 @@
extern "C" {
#include "main/mtypes.h"
+#include "main/shaderapi.h"
#include "main/shaderobj.h"
#include "main/uniforms.h"
#include "program/hash_table.h"
@@ -1458,7 +1459,7 @@ ir_to_mesa_visitor::visit(ir_dereference_variable *ir)
ir->var->location >= VERT_ATTRIB_GENERIC0) {
_mesa_add_attribute(prog->Attributes,
ir->var->name,
- type_size(ir->var->type) * 4,
+ _mesa_sizeof_glsl_type(ir->var->type->gl_type),
ir->var->type->gl_type,
ir->var->location - VERT_ATTRIB_GENERIC0);
}
More information about the mesa-commit
mailing list