← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/mesa/jaunty

« back to all changes in this revision

Viewing changes to src/mesa/shader/slang/slang_simplify.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-01-23 10:20:24 UTC
  • mfrom: (1.2.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20090123102024-1f3kmb3aea7wzk67
Tags: 7.3~rc3-1ubuntu1
* Merge with Debian experimental.
* Drop 102_dont_vblank.patch, since the new drm code in the kernel
  fixes the bugs that it worked around.
* Bump the build-dependency of libdrm to 2.4.4. It's the first version
  with necessary changes to build this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/shader/slang/slang_simplify.c
135
135
      /* look for user-defined constant */
136
136
      {
137
137
         slang_variable *var;
138
 
         var = _slang_locate_variable(oper->locals, oper->a_id, GL_TRUE);
 
138
         var = _slang_variable_locate(oper->locals, oper->a_id, GL_TRUE);
139
139
         if (var) {
140
140
            if (var->type.qualifier == SLANG_QUAL_CONST &&
141
141
                var->initializer &&
380
380
      /* Get type of arg[i] */
381
381
      if (!slang_typeinfo_construct(&argType))
382
382
         return GL_FALSE;
383
 
      if (!_slang_typeof_operation_(&callOper->children[i], space,
 
383
      if (!_slang_typeof_operation(&callOper->children[i], space,
384
384
                                    &argType, atoms, log)) {
385
385
         slang_typeinfo_destruct(&argType);
386
386
         return GL_FALSE;
464
464
         /* Get type of arg[i] */
465
465
         if (!slang_typeinfo_construct(&argType))
466
466
            return GL_FALSE;
467
 
         if (!_slang_typeof_operation_(&callOper->children[i], space,
 
467
         if (!_slang_typeof_operation(&callOper->children[i], space,
468
468
                                       &argType, atoms, log)) {
469
469
            slang_typeinfo_destruct(&argType);
470
470
            return GL_FALSE;