Commit Graph

38347 Commits

Author SHA1 Message Date
Kenneth Graunke
a044285e25 glsl: Move built-ins to live beyond the global scope.
Per the GLSL 1.20 specification (presumably a clarification of 1.10).

Also, when creating user functions, make a new ir_function that shadows the
built-in ir_function, rather than adding new signatures.  User functions
are supposed to hide built-ins, not overload them.

Fixes piglit tests redeclaration-{04, 12, 14}.vert.
2010-08-26 09:19:48 -07:00
Kenneth Graunke
b6f15869b3 glsl: Move is_built_in flag from ir_function_signature to ir_function.
Also rename it to "is_builtin" for consistency.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-08-26 09:19:48 -07:00
Kenneth Graunke
5d25746640 glsl: Refactor variable declaration handling.
Moving the check for an earlier variable declaration helps cleanly
separate out the re-declaration vs. new declaration code a bit.  With
that in place, conflicts between variable names and structure types or
function names aren't caught by the earlier "redeclaration" error
message, so check the return type on glsl_symbol_table::add_variable
and issue an error there.  If one occurs, don't emit the initializer.

Fixes redeclaration-01.vert and redeclaration-09.vert.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-08-26 09:19:48 -07:00
Kenneth Graunke
ac2376e6f5 glsl: Don't add overloads to existing structure constructors.
Instead, make a new ir_function and try to add it to the symbol table.

Fixes piglit test redeclaration-08.vert.
2010-08-26 09:19:48 -07:00
Kenneth Graunke
e09591317b glsl: Remove name_declared_this_scope check when adding functions.
Instead, rely on the symbol table's rules.

Fixes redeclaration-02.vert.
2010-08-26 09:19:48 -07:00
Kenneth Graunke
e9c7ceed27 glsl: Use a single shared namespace in the symbol table.
As of 1.20, variable names, function names, and structure type names all
share a single namespace, and should conflict with one another in the
same scope, or hide each other in nested scopes.

However, in 1.10, variables and functions can share the same name in the
same scope.  Structure types, however, conflict with/hide both.

Fixes piglit tests redeclaration-06.vert, redeclaration-11.vert,
redeclaration-19.vert, and struct-05.vert.
2010-08-26 09:19:48 -07:00
Brian Paul
86ddb356e8 st/mesa: add missing packed depth/stencil formats in st_format_datatype()
Fixes llvmpipe regression from one of the prev commits.
2010-08-26 09:20:21 -06:00
Brian Paul
7b07674667 mesa: fix mixed-up function call name 2010-08-26 08:59:54 -06:00
Nick Bowler
e71a9042cb mesa: Identify packed depth/stencil buffers using the Format field.
Intel sometimes uses packed depth/stencil buffers even when only a depth
buffer or only a stencil buffer was requested.  Common code currently
uses the _BaseFormat field to determine whether a depth/stencil wrapper
is necessary.  But unless the user explicitly requested a packed
depth/stencil buffer, the _BaseFormat field does not encode this
information, and the required wrappers are not created.

The problem was introduced by commit 45e76d2665 ("mesa: remove a
bunch of gl_renderbuffer fields"), which killed off the _ActualFormat
field upon which the decision to create a wrapper used to be made.  This
patch changes the logic to use the Format field instead, which is more
like the old code.

Fixes fdo bug 27590.

Signed-off-by: Nick Bowler <nbowler@draconx.ca>
Signed-off-by: Brian Paul <brianp@vmware.com>
2010-08-26 08:42:24 -06:00
Nick Bowler
bda941e1b8 intel: Merge identical cases in switch statement.
Signed-off-by: Nick Bowler <nbowler@draconx.ca>
Signed-off-by: Brian Paul <brianp@vmware.com>
2010-08-26 08:19:35 -06:00
Andre Maasikas
0599509fc4 r600: fix vertex buffer size calculation
when we dont know max_index we cannot calculate vb size from count
anymore - just use the bo size.
Also added an assert to remind that we dont handle GL_INT GL_DOUBLE
upload when we dont' know max_index - will fix later
2010-08-26 16:55:21 +03:00
José Fonseca
90437330e2 graw: Undo late loading of graw drivers.
Keith prefers a clean separation between graw applications and
implementations, where apps do not link libgallium.a but instead
get all functionality they need via graw interface.

Although this is not incompatible with late loading of graw drivers, it
it would make it very hard to maintain, as wrappers for every utility
symbol exposed in graw would have to be written or generated somehow.
2010-08-26 11:37:42 +01:00
Chia-I Wu
0f74efdef0 st/mesa: Fix glEGLImageTargetTexture2DOES.
stObj->pt should be set in st_bind_surface, just as in st_TexImage.  On
the other hand, st_TexImage should unreference stObj->pt.  It also needs
to initialize the texture image again as _mesa_clear_texture_object
clears the image.
2010-08-26 16:40:01 +08:00
Chia-I Wu
4f6faf65d1 st/egl: Add support for EGL_MESA_image_drm. 2010-08-26 16:40:01 +08:00
Chia-I Wu
9b6a63a0e2 st/egl: Add support for EGL_KHR_surfaceless_*. 2010-08-26 16:40:01 +08:00
Chia-I Wu
41c095bf31 st/mesa: Add support for surfaceless current contexts.
A surfaceless current context is a context that is made current without
draw and read framebuffers.  Such contexts can only render to FBOs.
2010-08-26 16:40:01 +08:00
Chia-I Wu
c5279fd795 st/egl: Make KMS support optional in KMS backend.
It should be called DRM backend now.
2010-08-26 16:40:01 +08:00
Vinson Lee
038068909f r300g: Include missing header in r300_texture_desc.h.
Include p_format.h for enum pipe_format symbol.

Fixes r300g build.
2010-08-26 01:38:23 -07:00
Vinson Lee
121b6d68c2 gallium: Clean up header file inclusion in p_defines.h.
Remove p_format.h.
Include p_compiler.h for boolean and uint64_t symbols.
2010-08-26 01:30:50 -07:00
Vinson Lee
81ac08f89d gallium: Clean up header file inclusion in p_context.h.
Remove p_state.h.
Include p_compiler.h for boolean symbol.
Add needed forward declarations after removing p_state.h.
2010-08-26 01:21:10 -07:00
Vinson Lee
2badf0f642 graw: Include missing header in graw_dl.h.
Include p_state.h for pipe_shader_state symbol.
2010-08-26 01:14:28 -07:00
Vinson Lee
57ce0de8cb util: Include missing header in u_simple_shaders.c.
Include p_state.h for PIPE_MAX_COLOR_BUFS symbol.
2010-08-26 01:08:30 -07:00
Vinson Lee
f099e73b7b tgsi: Include missing header in tgsi_sse2.h.
Include p_compiler.h for boolean symbol.
Clean up forward declarations.
2010-08-26 00:34:30 -07:00
Vinson Lee
b47af6ad6d rtasm: Include missing header in rtasm_x86sse.h.
Include p_compiler.h for stdint.h uint*_t symbols.
2010-08-26 00:29:58 -07:00
Vinson Lee
7822f99193 pipebuffer: Clean up header file inclusion in pb_bufmgr.h.
Remove p_compiler.h and p_defines.h.
Include pb_buffer.h for pb_size symbol.
2010-08-26 00:22:19 -07:00
Eric Anholt
9fd2a8d692 glsl2: Move ir_expression_flattening to using the rvalue visitor class.
The previous implementation was missing handling of some rvalues, such
as "if" conditions, leading to glsl-mat-int-from-ctor-* not getting
caught.
2010-08-26 00:15:18 -07:00
Eric Anholt
c735d85395 glsl: Don't consider things with a type containing a sampler as an lvalue.
We had ad-hoc handled some common cases by flagging sampler-typed
variables as read_only, and rejected initializers of samplers.
However, people could sneak them in in all sorts of surprising ways,
like using whole-array or structure assignment.

Fixes:
glslparsertest/glsl2/sampler-01.frag
glslparsertest/glsl2/sampler-03.frag
glslparsertest/glsl2/sampler-04.frag
glslparsertest/glsl2/sampler-06.frag

Bug #27403.
2010-08-25 23:43:21 -07:00
Eric Anholt
aa2f55883b mesa: Disable the debug spam for x86 CPU detection with a compile-time flag.
I don't know of any problems with CPU detection in years.  Don't spam
the user that was just looking to enable assertions with this stuff.
2010-08-25 23:43:21 -07:00
Eric Anholt
7af8f7f164 mesa: Move the x86 detection debug messages next to the detection. 2010-08-25 23:43:21 -07:00
Eric Anholt
0673b46933 mesa: Don't warn when the desired result of s3tc lib available occurs. 2010-08-25 23:43:21 -07:00
Vinson Lee
d8ad10dc45 util: Include missing header in u_blit.h.
Include p_compiler.h for uint symbol.
Clean up forward declarations.
2010-08-25 23:37:27 -07:00
Vinson Lee
3e41029d6e util: Include missing header in u_bitmask.h.
Include p_compiler.h for boolean symbol.
2010-08-25 23:31:04 -07:00
Vinson Lee
d2dd23e858 util: Include missing header in u_dirty_surfaces.h.
Include p_state.h for pipe_surface symbol.
2010-08-25 23:04:39 -07:00
Vinson Lee
c7111f321c util: Add include guard in u_split_prim.h. 2010-08-25 22:55:15 -07:00
Vinson Lee
cc3e322d96 util: Include missing headers in u_split_prim.h.
Include p_compiler.h for boolean symbol.
Include u_debug.h for assert symbol.
2010-08-25 22:51:15 -07:00
José Fonseca
43d94dba5f graw: Remove graw-null.
Pointless now that the graw tests can be built independently of any graw
implementation.
2010-08-26 06:47:24 +01:00
José Fonseca
f0eb02af80 graw: Dynamically load graw libraries.
This allows to build multiple graws libs simultaneously and avoid
unnecessary rebuilds of the tests.

Also remove graw_util.c from inside the graw implementation -- it was
only being provided by one implementation, and graw tests were linking
against gallium anyway.
2010-08-26 06:44:34 +01:00
José Fonseca
c32f87c39c scons: Fix old script compatability logic.
Sconscript could be invoked twice if specified in the command line.
2010-08-26 06:44:34 +01:00
Vinson Lee
58cfbd697d util: Include missing headers in u_tile.h.
Include p_format.h for enum pipe_format symbol.
Include p_state.h for pipe_box symbol.
2010-08-25 22:41:20 -07:00
Vinson Lee
c65c86cfe7 util: Clean up header file inclusion in u_upload_mgr.h.
Remove p_defines.h.
Remove unnecessary forward declarations.
Add forward declaration for pipe_context.
2010-08-25 22:34:31 -07:00
Marek Olšák
c1ab2c327e r300g: fix constant buffer upload once again for r3xx->r4xx 2010-08-26 07:19:10 +02:00
Vinson Lee
fdf054a585 r600: Remove unnecessary headers. 2010-08-25 18:06:01 -07:00
Vinson Lee
d430aea8bc r300: Remove unnecessary header. 2010-08-25 18:00:23 -07:00
Eric Anholt
b2872ea353 Revert "mesa: Don't add 1 to GL_ACTIVE_UNIFORM_MAX_LENGTH."
This reverts commit 001a7bfdfc.  I
hadn't found the section of the spec clarifying that the old behavior
was right.  Reverting fixes the new version of the testcase, and the
Humus demos that could no longer find their uniforms.

Bug #29782
Bug #29783
2010-08-25 16:45:31 -07:00
Aras Pranckevicius
5226f8c7b0 glsl: fix crash with variable indexing into array in a struct
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-08-25 16:22:44 -07:00
Eric Anholt
a1f2ac2b37 i965: Fix detection of implicit MOVs to message regs in brw_optimize.c.
Texcoords in AmbientApertureLighting were getting trashed since the
move of math arguments to implied moves, due to the logic for
detecting ALU message reg writes overriding the logic for SEND
implicit message reg writes.
2010-08-25 16:03:56 -07:00
Marcin Slusarz
a49167c1c0 nouveau: handle early initialization errors
handle very early errors in pipe_screen creation (failure of
nouveau_screen_init in nv50_screen_create)

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
2010-08-26 00:28:01 +02:00
Jerome Glisse
bd25e23bf3 r600g: simplify states
Directly build PM4 packet, avoid using malloc (no states are
bigger than 128 dwords), remove unecessary informations,
remove pm4 building in favor of prebuild pm4 packet.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2010-08-25 17:41:50 -04:00
Eric Anholt
b5c07b9226 mesa: Remove now-unused _mesa_add_sampler().
We do the generation of "what sampler number within Parameters are we"
right in ir_to_mesa.cpp, instead of repeatedly walking the existing
list to find out.
2010-08-25 12:38:32 -07:00
Eric Anholt
aa452e20bf ir_to_mesa: Add support for samplers in structures.
Fixes:
glsl-fs-uniform-sampler-struct
glsl-fs-sampler-numbering-3
Bug #29690
2010-08-25 12:38:27 -07:00