mesa.git
13 years agoglcpp: Allow standalone glcpp to accept a filename as first argument.
Carl Worth [Wed, 18 Aug 2010 06:13:56 +0000 (23:13 -0700)]
glcpp: Allow standalone glcpp to accept a filename as first argument.

This is useful for debugging the preprocessor.

13 years agor600g: add FRC, FLR, DDX and DDY
Dave Airlie [Wed, 18 Aug 2010 06:10:16 +0000 (16:10 +1000)]
r600g: add FRC, FLR, DDX and DDY

the first two are straight op2's and the DDX/DDY are taken from r600c.

13 years agor600g: add SGE and SLE opcodes
Dave Airlie [Wed, 18 Aug 2010 05:53:29 +0000 (15:53 +1000)]
r600g: add SGE and SLE opcodes

fixes fp-set-01 and glsl-fs-step

13 years agor600g: add TXB support
Dave Airlie [Wed, 18 Aug 2010 05:26:28 +0000 (15:26 +1000)]
r600g: add TXB support

fixes biased texturing tests

13 years agor600g: fix TXP vs TEX in shader.
Dave Airlie [Wed, 18 Aug 2010 05:05:34 +0000 (15:05 +1000)]
r600g: fix TXP vs TEX in shader.

Don't do perspective for TEX, and also copy input to a temporary for TEX

also add tex opcode names

13 years agoglcpp: Fix 064-version.c expected result to track recent change.
Carl Worth [Wed, 18 Aug 2010 05:23:43 +0000 (22:23 -0700)]
glcpp: Fix 064-version.c expected result to track recent change.

In commit 6be3a8b70af4ba4fa4d037d54ecf6d5f055edbc9, the #version directive
was fixed to stop generating a spurious newline. Here we simply update
the expected result for the single test which includes a #version directive.

13 years agoglcpp: Regenerated glcpp-lex.c from previous commit.
Carl Worth [Wed, 18 Aug 2010 05:22:13 +0000 (22:22 -0700)]
glcpp: Regenerated glcpp-lex.c from previous commit.

The previous commit changed glcpp-lex.l so we commit the resulting
generated file here.

13 years agoglcpp: Don't include the newline when discarding single-line comments
Carl Worth [Wed, 18 Aug 2010 05:17:09 +0000 (22:17 -0700)]
glcpp: Don't include the newline when discarding single-line comments

Matching the newline here meant having to do some redundant work here,
(incrementing line number, resetting column number, and returning a
NEWLINE token), that could otherwise simply be left to the existing rule
which matches a newline.

Worse, when the comment rule matches the newline as well, the parser
can lookahead and see a token for something that should actually be skipped.

For example, in a case like this:

#if 0 // comment here
fail
#else
win
#endif

Both fail and win appear in the output, (not that the condition is being
evaluated incorrectly---merely that one token after the comment's newline
was being lexed/parse regardless of the condition).

This commit fixes the above test case, (which is also remarkably similar
to 087-if-comments which now passes).

13 years agor600g: add two simple tgsi opcodes.
Dave Airlie [Wed, 18 Aug 2010 03:48:04 +0000 (13:48 +1000)]
r600g: add two simple tgsi opcodes.

makes glsl-fs-log2 and glsl1-integer division with uniform var pass

13 years agor600g: fix point size
Dave Airlie [Wed, 18 Aug 2010 03:29:41 +0000 (13:29 +1000)]
r600g: fix point size

fixes piglit pointAtten and point-sprite tests

13 years agoir_to_mesa: Allow ir_return in main().
Eric Anholt [Wed, 18 Aug 2010 02:41:27 +0000 (19:41 -0700)]
ir_to_mesa: Allow ir_return in main().

I didn't expect that this would really work, but it turns out there
are shaders in the wild that do it.

Fixes: (with swrast)
glsl-fs-main-return
glsl-vs-main-return

13 years agoi965: Throw a link error when we see a "return" in main().
Eric Anholt [Wed, 18 Aug 2010 02:51:00 +0000 (19:51 -0700)]
i965: Throw a link error when we see a "return" in main().

We'll need to use the HALT instruction to do this right, like returns
from other functions.

13 years agor600g: fixup pitch alignment like r600c.
Dave Airlie [Wed, 18 Aug 2010 01:49:51 +0000 (11:49 +1000)]
r600g: fixup pitch alignment like r600c.

This still needs work, passes tex3d, fbo-scissor-bitmap, scissor-bitmap

13 years agotranslate_sse: don't overwrite source buffer pointer
Luca Barbieri [Wed, 18 Aug 2010 02:14:43 +0000 (04:14 +0200)]
translate_sse: don't overwrite source buffer pointer

We were putting the source pointer in a register used as a temporary,
breaking all paths that don't read the data in a single instruction.

13 years agoglcpp: Add testcase for #if handling bug that breaks Savage2.
Eric Anholt [Wed, 18 Aug 2010 00:50:05 +0000 (17:50 -0700)]
glcpp: Add testcase for #if handling bug that breaks Savage2.

13 years agor600g: fix height calcs for miptree
Dave Airlie [Wed, 18 Aug 2010 00:50:19 +0000 (10:50 +1000)]
r600g: fix height calcs for miptree

h needs to be rounded up, this probably needs revisiting when we get
to tiling etc.

fixes fbo-generatemipmap-npot

13 years agor600g: emit texture level offset in CB/DB setup.
Dave Airlie [Tue, 17 Aug 2010 23:56:21 +0000 (09:56 +1000)]
r600g: emit texture level offset in CB/DB setup.

8 more piglit tests pass,
fbo-clearmipmap, fbo-copyteximage, fbo-generatemipmap,
fbo-generatemipmap-nonsquare, fbo-generatemipmap-scissor,
fbo-generatemipmap-viewport, gen-teximage, gen-texsubimage

13 years agoir_to_mesa: Fix implementation of ir_binop_equal, ir_binop_notequal.
Eric Anholt [Wed, 18 Aug 2010 00:24:42 +0000 (17:24 -0700)]
ir_to_mesa: Fix implementation of ir_binop_equal, ir_binop_notequal.

These binops are the vector-to-bool comparisons, not vec-to-bvec.  We
likely want both operations avilable as expression, since 915 and 965
FS naturally does the vector version, while 965 VS can also naturally
do the scalar version.  However, we can save that until later.

Fixes:
glsl-fs-vec4-operator-equal.shader_test
glsl-fs-vec4-operator-notequal.shader_test
glsl-vs-vec4-operator-equal.shader_test
glsl-vs-vec4-operator-notequal.shader_test

13 years agoi915: Add support for SSG opcode.
Eric Anholt [Tue, 17 Aug 2010 23:12:15 +0000 (16:12 -0700)]
i915: Add support for SSG opcode.

Fixes glsl-fs-sign and many of the tests of trig builtins.

13 years agoi915: Add support for reading output regs in the FS.
Eric Anholt [Tue, 17 Aug 2010 22:51:34 +0000 (15:51 -0700)]
i915: Add support for reading output regs in the FS.

Fixes glsl-unused-varying and many others, since we produce an output
reg read any time gl_FragColor is written inside an if statement.

13 years agoi915: Add support for OPCODE_DP2.
Eric Anholt [Tue, 17 Aug 2010 22:42:40 +0000 (15:42 -0700)]
i915: Add support for OPCODE_DP2.

Fixes glsl-fs-dot-vec2.

13 years agoi915: Enable ARB_fragment_shader by default.
Eric Anholt [Tue, 17 Aug 2010 22:07:22 +0000 (15:07 -0700)]
i915: Enable ARB_fragment_shader by default.

Now that we have glsl2 with if flattening in place, most shaders will
just work.  Remaining failing shaders will mostly be due to loop
unrolling (in progress), some possible if flattening failures in
inlining functions (planning on fixing), and the register/instruction
count limits.

While the GLSL and GLSL-ES specs say that shaders shouldn't fail to
compile/link due to register/instruction limits, in practice we're not
the first vendor to expose GLSL on hardware with these limitations.
The benefit to application developers of providing a better language
for GPU programming is greater than the pain of having to handle
instruction limits (which they had to for ARB_fp on this hardware
anyway)

13 years agoglsl2: Fix transpose of rows and cols
Ian Romanick [Tue, 17 Aug 2010 22:57:48 +0000 (15:57 -0700)]
glsl2: Fix transpose of rows and cols

This error led to an assertion failure for some constructors of
non-square matrices.  It only occured in matrices where the number of
columns was greater than the number of rows.  It didn't even always
occur on those.

Fixes piglit glslparsertest case constructor-16.vert.

13 years agor600c: Handle reads from PROGRAM_OUTPUT
Henri Verbeet [Tue, 17 Aug 2010 22:25:32 +0000 (18:25 -0400)]
r600c: Handle reads from PROGRAM_OUTPUT

with glsl2, reads from outputs are legal

13 years agolinker: Demote user-defined varyings in the VS-only case
Ian Romanick [Tue, 17 Aug 2010 21:55:50 +0000 (14:55 -0700)]
linker: Demote user-defined varyings in the VS-only case

Fixes piglit test case glsl-vs-ff-frag and bugzilla #29623.

13 years agoprog_optimize: Only merge writes to temporary registers
Benjamin Segovia [Tue, 17 Aug 2010 03:40:09 +0000 (20:40 -0700)]
prog_optimize: Only merge writes to temporary registers

In one optimization pass, register files may have been messed therefore
merging instructions which use the same index in two different register
files.

13 years agor600g: fix fake pixel output
Jerome Glisse [Tue, 17 Aug 2010 21:23:20 +0000 (17:23 -0400)]
r600g: fix fake pixel output

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
13 years agoi965: Add support for DP2 in the VS.
Eric Anholt [Tue, 17 Aug 2010 20:59:08 +0000 (13:59 -0700)]
i965: Add support for DP2 in the VS.

Fixes glsl-vs-dot-vec2.

13 years agoglsl: When doing algebraic simplification, make sure the type still matches.
Eric Anholt [Tue, 17 Aug 2010 20:24:50 +0000 (13:24 -0700)]
glsl: When doing algebraic simplification, make sure the type still matches.

When simplifying (vec4(1.0) / (float(x))) to rcp(float(x)), we forgot
to produce a vec4, angering ir_validate when starting alien-arena.

Fixes:
glsl-algebraic-add-zero-2
glsl-algebraic-div-one-2
glsl-algebraic-mul-one-2
glsl-algebraic-sub-zero-3
glsl-algebraic-rcp-sqrt-2

13 years agoglsl: Make ir_algebraic new expressions allocate out of the parent.
Eric Anholt [Tue, 17 Aug 2010 20:27:44 +0000 (13:27 -0700)]
glsl: Make ir_algebraic new expressions allocate out of the parent.

This could reduce the amount of memory used by a shader tree after
optimization, and increases consistency with other passes.

13 years agoir_constant: Don't assert on out-of-bounds array accesses
Ian Romanick [Tue, 17 Aug 2010 19:57:28 +0000 (12:57 -0700)]
ir_constant: Don't assert on out-of-bounds array accesses

Several optimization paths, including constant folding, can lead to
accessing an ir_constant array with an out of bounds index.  The GLSL
spec lets us produce "undefined" results, but it does not let us
crash.

Fixes piglit test case glsl-array-bounds-01 and glsl-array-bounds-03.

13 years agomesa: Dump shader source before validating the shader.
Eric Anholt [Tue, 17 Aug 2010 19:37:49 +0000 (12:37 -0700)]
mesa: Dump shader source before validating the shader.

This will make extracting source to produce minimal testcases for
shader compile issues easier.

13 years agor600c: fix dword miscount in blit emit code
Alex Deucher [Tue, 17 Aug 2010 14:42:06 +0000 (10:42 -0400)]
r600c: fix dword miscount in blit emit code

13 years agotargets/egl: Link with DRI_LIB_DEPS.
Chia-I Wu [Tue, 17 Aug 2010 11:24:18 +0000 (19:24 +0800)]
targets/egl: Link with DRI_LIB_DEPS.

Use DRI_LIB_DEPS when linking GL/GLES state trackers.  This fixes
missing talloc symbol errors, and is hopefully more future proof.

13 years agogallivm: Fix and re-enable MMX-disabling code
nobled [Mon, 16 Aug 2010 16:46:14 +0000 (16:46 +0000)]
gallivm: Fix and re-enable MMX-disabling code

Signed-off-by: José Fonseca <jfonseca@vmware.com>
13 years agomesa: fix es1/2 build hopefully
Dave Airlie [Tue, 17 Aug 2010 10:54:45 +0000 (20:54 +1000)]
mesa: fix es1/2 build hopefully

needed to add cpp rules and includes properly for es1/es2

13 years agor300g: fix context destroy under hyperz
Dave Airlie [Tue, 17 Aug 2010 09:01:18 +0000 (19:01 +1000)]
r300g: fix context destroy under hyperz

we were destroying the mm before unrefing all the objects, so segfault.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agoscons: Add -fno-common for 64-bit builds on Mac OS X.
Vinson Lee [Tue, 17 Aug 2010 07:20:58 +0000 (00:20 -0700)]
scons: Add -fno-common for 64-bit builds on Mac OS X.

This option is also needed for 64-bit builds if llvm is enabled.
Other the build fails during linking.

13 years agor600g: kill event type magic number in winsys
Dave Airlie [Tue, 17 Aug 2010 05:16:53 +0000 (15:16 +1000)]
r600g: kill event type magic number in winsys

these events have names, use them.

13 years agoconfigs: Add -ltalloc to linux-dri.
Vinson Lee [Tue, 17 Aug 2010 05:41:44 +0000 (22:41 -0700)]
configs: Add -ltalloc to linux-dri.

Fixes build after glsl2 branch merge, which added talloc dependency.

13 years agor600g: add user clip plane support.
Dave Airlie [Tue, 17 Aug 2010 03:40:15 +0000 (13:40 +1000)]
r600g: add user clip plane support.

Apart from the fact that the radeon.h/r600_states.h editing is a nightmare, this
wasn't so bad.

passes piglit user-clip test now also trivial tests.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agoi965: Use the implied move available in most brw_wm_emit brw_math() calls.
Eric Anholt [Tue, 17 Aug 2010 02:18:11 +0000 (19:18 -0700)]
i965: Use the implied move available in most brw_wm_emit brw_math() calls.

This saves an extra message reg move in the program, though I'm not
clear on whether it will have any performance impact other than cache
footprint.  It will also fix those math calls on Sandybridge, where
the brw_eu_emit.c brw_math() support relies on the implied move being
used.

13 years agoi965: Add disasm for Compr4 instruction compression.
Eric Anholt [Fri, 9 Jul 2010 00:05:42 +0000 (17:05 -0700)]
i965: Add disasm for Compr4 instruction compression.

13 years agoMerge branch 'glsl2'
Ian Romanick [Tue, 17 Aug 2010 02:08:53 +0000 (19:08 -0700)]
Merge branch 'glsl2'

Conflicts:
src/mesa/program/prog_optimize.c

13 years agoutil: Remove check_os_katmai_support.
Vinson Lee [Tue, 17 Aug 2010 01:52:37 +0000 (18:52 -0700)]
util: Remove check_os_katmai_support.

check_os_katmai_support checks that the operating system running on a
SSE-capable processor supports SSE. This is necessary for unpatched
2.2.x and earlier kernels. 2.4.x and later kernels support SSE.

check_os_katmai_support will disable SSE capabilities for 32-bit x86
operating systems for which there is no code path. Currently, this
function handles Linux, Windows, and several BSDs. Mac OS, Cygwin, and
Solaris are several operating systems with no code paths.

Rather than add code for the unhandled operating systems, remove this
function altogether. This will fix SSE detection on all recent 32-bit
x86 operating systems. This completely breaks functionality on unpatched
2.2.x and earlier kernels, although there are likely no Gallium3D users
on such operating systems.

13 years agor600g: drop libdrm_radeon link
Dave Airlie [Fri, 13 Aug 2010 03:54:25 +0000 (13:54 +1000)]
r600g: drop libdrm_radeon link

13 years agoglsl2: Refresh autogenerated file builtin_function.cpp.
Kenneth Graunke [Mon, 16 Aug 2010 22:18:23 +0000 (15:18 -0700)]
glsl2: Refresh autogenerated file builtin_function.cpp.

13 years agoglsl2: Add builtins profile for GLSL 1.30.
Kenneth Graunke [Mon, 16 Aug 2010 22:14:04 +0000 (15:14 -0700)]
glsl2: Add builtins profile for GLSL 1.30.

Many functions are currently wrapped with #if 0 since we haven't
implemented them yet.

13 years agolinker: Include compiler.h to avoid spurious warnings about INLINE
Ian Romanick [Mon, 16 Aug 2010 20:59:34 +0000 (13:59 -0700)]
linker: Include compiler.h to avoid spurious warnings about INLINE

13 years agoglsl2: Silence unused variable warning
Ian Romanick [Mon, 16 Aug 2010 20:59:01 +0000 (13:59 -0700)]
glsl2: Silence unused variable warning

13 years agotranslate: Move loop variable declaration outside for loop.
Vinson Lee [Mon, 16 Aug 2010 20:52:57 +0000 (13:52 -0700)]
translate: Move loop variable declaration outside for loop.

Fixes MSVC build.

13 years agoglcpp: Refresh autogenerated lexer and parser.
Kenneth Graunke [Mon, 16 Aug 2010 20:43:10 +0000 (13:43 -0700)]
glcpp: Refresh autogenerated lexer and parser.

13 years agoglcpp: Remove spurious newline generated by #version handling.
Kenneth Graunke [Mon, 16 Aug 2010 20:42:04 +0000 (13:42 -0700)]
glcpp: Remove spurious newline generated by #version handling.

This was causing line numbering to be off by one.  The newline comes
from the NEWLINE token at the end of the line; there's no need to
insert one.

13 years agor300g: fix assert in the rasterizer block for r3xx-r4xx
Marek Olšák [Mon, 16 Aug 2010 17:17:02 +0000 (19:17 +0200)]
r300g: fix assert in the rasterizer block for r3xx-r4xx

Reported-by: Niels Ole Salscheider <niels_ole@salscheider-online.de>
13 years agoir_to_mesa: Silence unused variable warnings
Ian Romanick [Mon, 16 Aug 2010 16:45:01 +0000 (09:45 -0700)]
ir_to_mesa: Silence unused variable warnings

13 years agoir_to_mesa: Clean up assertions in ir_to_mesa_visitor::visit(ir_texture *)
Ian Romanick [Mon, 16 Aug 2010 16:43:00 +0000 (09:43 -0700)]
ir_to_mesa: Clean up assertions in ir_to_mesa_visitor::visit(ir_texture *)

13 years agoir_to_mesa: Support texture rectangle targets
Ian Romanick [Mon, 16 Aug 2010 16:39:58 +0000 (09:39 -0700)]
ir_to_mesa: Support texture rectangle targets

13 years agotranslate: Remove unused temporary register.
José Fonseca [Mon, 16 Aug 2010 16:20:54 +0000 (17:20 +0100)]
translate: Remove unused temporary register.

Assuming the side-effect of x86_make_reg is also unnecessary.

13 years agotranslate: Eliminate void pointer arithmetic.
José Fonseca [Mon, 16 Aug 2010 16:18:14 +0000 (17:18 +0100)]
translate: Eliminate void pointer arithmetic.

Non-portable.

13 years agost/egl: Add support for EGL_KHR_fence_sync.
Chia-I Wu [Sun, 15 Aug 2010 09:24:14 +0000 (17:24 +0800)]
st/egl: Add support for EGL_KHR_fence_sync.

The extension is implemented by pipe_fence_handle.

13 years agoegl: Add support for EGL_KHR_fence_sync.
Chia-I Wu [Sun, 15 Aug 2010 09:09:48 +0000 (17:09 +0800)]
egl: Add support for EGL_KHR_fence_sync.

Individual drivers still need to support and enable the extension.

13 years agost/egl: Add support for EGL_KHR_reusable_sync.
Chia-I Wu [Sat, 14 Aug 2010 15:56:46 +0000 (23:56 +0800)]
st/egl: Add support for EGL_KHR_reusable_sync.

The extension is implemented by pipe_condvar.

13 years agoegl: Add support for EGL_KHR_reusable_sync.
Chia-I Wu [Sat, 14 Aug 2010 15:09:12 +0000 (23:09 +0800)]
egl: Add support for EGL_KHR_reusable_sync.

Individual drivers still need to support and enable the extension.

13 years agoegl: Update eglext.h.
Chia-I Wu [Sun, 15 Aug 2010 16:18:30 +0000 (00:18 +0800)]
egl: Update eglext.h.

Update to version 7 for EGL_KHR_fence_sync.

13 years agor600c: blit emit updates
Alex Deucher [Mon, 16 Aug 2010 15:34:17 +0000 (11:34 -0400)]
r600c: blit emit updates

- set VGT_MAX_VTX_INDX to a larger value
- emit PA_SC_AA_CONFIG.  The command checker in 2.6.36+
  requires this reg.

13 years agodraw_llvm: fix segfaults on non-SSE2 CPUs where it is disabled (v2)
Luca Barbieri [Sun, 15 Aug 2010 05:37:31 +0000 (07:37 +0200)]
draw_llvm: fix segfaults on non-SSE2 CPUs where it is disabled (v2)

Changes in v2:
- Change function name

Currently draw_llvm refuses to create itself on non-SSE2 CPUs due to
an alleged LLVM bug.

However, this is implemented improperly, because other parts of draw
still attempt to access draw->llvm, resulting in segfaults.

Instead, put the check in debug_get_option_draw_use_llvm, check that
before calling draw_llvm_create, and then check whether draw->llvm is
non-null everywhere else.

13 years agotranslate_sse: major rewrite (v5)
Luca Barbieri [Tue, 10 Aug 2010 00:14:04 +0000 (02:14 +0200)]
translate_sse: major rewrite (v5)

NOTE: Win64 is untested, and is thus currently disabled.
If you have such a system, please enable it and report whether it works.
To enable it, change src/gallium/auxiliary/translate/translate.c

Changes in v5:
- On Win64, preserve %xmm6 and %xmm7 as required by the ABI
- Use _WIN64 instead of WIN64

Changes in v4:
- Use x86_target() and x86_target_caps()
- Enable translate_sse in x86-64, but not in Win64

Changes in v3:
- Win64 support (untested)
- Use u_cpu_detect.h constants instead of #ifs

Changes in v2:
- Minimize #ifs
- Give a name to magic number CHANNELS_0001
- Add support for CPUs without SSE (only memcpy and swizzles, like non SSE2)
- Fixed comments

translate_sse is currently very limited to the point of
being useless in essentially all cases.

In particular, it only support some float32 and unorm8
formats and doesn't work on x86-64.

This commit rewrites it to support:
1. Dumb memory copy for any pair of identical formats
2. All formats that are swizzles of each other
3. Converting 32/64-bit floats and all 8/16/32-bit integers to 32-bit float
4. Converting unorm8/snorm8 to snorm16 and uscaled8/sscaled8 to sscaled16
5. Support for x86-64 (doesn't take advantage of it in any way though)

This new translate can even be useful to translate index buffers for
cards that lack 8-bit index support.

It passes the testsuite I wrote, but note that this is a major change, and more
testing would be great.

13 years agortasm: add minimal x86-64 support and new instructions (v5)
Luca Barbieri [Thu, 12 Aug 2010 16:27:02 +0000 (18:27 +0200)]
rtasm: add minimal x86-64 support and new instructions (v5)

Changes in v5:
- Add sse2_movdqa

Changes in v4:
- Use _WIN64 instead of WIN64

Changes in v3:
- Add target and target caps functions, so that they could be different in
  principle from the current CPU and they don't need #ifs to check

Changes in v2:
- Win64 support (untested)
- Use u_cpu_detect.h constants instead of #ifs

This commit adds minimal x86-64 support: only movs between registers
are supported for r8-r15, and x64_rexw() must be used to ask for 64-bit
operations.

It also adds several new instructions for the new translate_sse code.

movdqa

13 years agotranslate: add support for 8/16-bit indices
Luca Barbieri [Tue, 10 Aug 2010 08:47:23 +0000 (10:47 +0200)]
translate: add support for 8/16-bit indices

Currently, only 32-bit indices are supported, but some use cases
translate needs support for all types.

13 years agotranslate_sse: remove useless generated function wrappers
Luca Barbieri [Tue, 10 Aug 2010 08:31:48 +0000 (10:31 +0200)]
translate_sse: remove useless generated function wrappers

Currently translate_sse puts two trivial wrappers in the translate vtable.

These slow it down and enlarge the source code for no gain, except perhaps
the ability to set a breakpoint there, so remove them.

Breakpoints can be set on the caller of the translate functions, with no
loss of functionality.

13 years agotranslate_generic: factor out common code between linear and indexed
Luca Barbieri [Tue, 10 Aug 2010 08:27:14 +0000 (10:27 +0200)]
translate_generic: factor out common code between linear and indexed

This moves the common code into a separate ALWAYS_INLINE function.

13 years agotranslate_generic: use memcpy if possible (v3)
Luca Barbieri [Tue, 10 Aug 2010 07:51:20 +0000 (09:51 +0200)]
translate_generic: use memcpy if possible (v3)

Changes in v3:
- If we can do a copy, don't try to get an emit func, as that can assert(0)

Changes in v2:
- Add comment regarding copy_size

When used in GPU drivers, translate can be used to simultaneously
perform a gather operation, and convert away from unsupported formats.

In this use case, input and output formats will often be identical: clearly
it would make sense to use a memcpy in this case.

Instead, translate will insist to convert to and from 32-bit floating point
numbers.

This is not only extremely expensive, but it also loses precision for
32/64-bit integers and 64-bit floating point numbers.

This patch changes translate_generic to just use memcpy if the formats are
identical, non-blocked, and with an integral number of bytes per pixel (note
that all sensible vertex formats are like this).

13 years agodrwa: Fix polygon edge flags.
Chia-I Wu [Mon, 16 Aug 2010 14:00:45 +0000 (22:00 +0800)]
drwa: Fix polygon edge flags.

Fix a copy-and-paste error introduced by
f141abdc8fdbff41e16b0ce53fa3fa8fba32a7f9.

13 years agodraw: No need to make max_vertices even.
Chia-I Wu [Mon, 9 Aug 2010 17:05:25 +0000 (01:05 +0800)]
draw: No need to make max_vertices even.

Triangle strip alternates the front/back orientation of its triangles.
max_vertices was made even so that varray never splitted a triangle
strip at the wrong positions.

It did not work with triangle strips with adjacencies.  And it is no
longer relevant with vsplit.

13 years agodraw: Remove DRAW_PIPE_MAX_VERTICES and DRAW_PIPE_FLAG_MASK.
Chia-I Wu [Sat, 7 Aug 2010 13:02:13 +0000 (21:02 +0800)]
draw: Remove DRAW_PIPE_MAX_VERTICES and DRAW_PIPE_FLAG_MASK.

The higher bits of draw elements are no longer used for the stipple or
edge flags.

13 years agodrwa: Add PRIMITIVE macro to vsplit.
Chia-I Wu [Fri, 13 Aug 2010 16:05:28 +0000 (00:05 +0800)]
drwa: Add PRIMITIVE macro to vsplit.

PRIMITIVE is used by the indexed path to flush the entire primitive with
custom vertex count checks.  It replaces the existing fast path.

13 years agodraw: last_vertex_last is always true for GS and SO.
Chia-I Wu [Mon, 9 Aug 2010 16:39:23 +0000 (00:39 +0800)]
draw: last_vertex_last is always true for GS and SO.

That is, OpenGL decomposition rule is assumed.  There should be a
pipe_context state to specify the rules.

13 years agodraw: Remove varray and vcache.
Chia-I Wu [Sat, 7 Aug 2010 07:18:24 +0000 (15:18 +0800)]
draw: Remove varray and vcache.

They have been deprecated by vsplit.

13 years agodraw: Replace vcache by vsplit.
Chia-I Wu [Sat, 7 Aug 2010 12:44:02 +0000 (20:44 +0800)]
draw: Replace vcache by vsplit.

vcache decomposes primitives while vsplit splits primitives.  Splitting
is generally easier to do and is faster.  More importantly, vcache
depends on flatshade_first to decompose.  The outputs may have incorrect
vertex order which is significant to GS.

13 years agodraw: Replace varray by vsplit.
Chia-I Wu [Sat, 7 Aug 2010 07:12:14 +0000 (15:12 +0800)]
draw: Replace varray by vsplit.

vsplit is a superset of varray.  It sets the split flags comparing to
varray.

13 years agodraw: Add vsplit frontend.
Chia-I Wu [Fri, 6 Aug 2010 19:36:18 +0000 (03:36 +0800)]
draw: Add vsplit frontend.

vsplit is based on varray.  It sets the split flags when a primitive is
splitted.  It also has support for indexed primitives.

For indexed primitives, unlike vcache, vsplit splits the primitives
instead of decomposes them.

13 years agodraw: Add new util function draw_pt_trim_count.
Chia-I Wu [Sat, 7 Aug 2010 06:37:26 +0000 (14:37 +0800)]
draw: Add new util function draw_pt_trim_count.

draw_pt_trim_count is renamed from trim in draw_pt.c.

13 years agodraw: Simplify frontend interface a little.
Chia-I Wu [Sun, 18 Jul 2010 08:53:57 +0000 (16:53 +0800)]
draw: Simplify frontend interface a little.

The run method is simplified to take the start vertex and the vertex
count.

13 years agodraw: Add prim flags to middle ends.
Chia-I Wu [Sat, 7 Aug 2010 16:53:02 +0000 (00:53 +0800)]
draw: Add prim flags to middle ends.

Update the middle end interface to pass the primitive flags from the
frontends to the pipeline.  No frontend sets the flags yet.

13 years agodraw: Add flags to draw_prim_info.
Chia-I Wu [Sat, 7 Aug 2010 17:13:26 +0000 (01:13 +0800)]
draw: Add flags to draw_prim_info.

A primitive may be splitted in frontends.  The splitted primitives
should convey certain flag bits so that the decomposer can correctly
decide the stipple or edge flags.

This commit adds flags to draw_prim_info and updates the decomposer to
honor the flags.  Frontends and middle ends will be updated later.

13 years agost/mesa: test for FEATURE defines
nobled [Fri, 13 Aug 2010 20:23:11 +0000 (20:23 +0000)]
st/mesa: test for FEATURE defines

'struct dd_function_table' only conditionally contains
the function pointer NewFramebuffer and friends based on
FEATURE_EXT_framebuffer_* defines. (See src/mesa/main/dd.h)

Fixes the build when the features are disabled and the vfuncs
don't exist.

13 years agodri/nouveau: test for FEATURE defines
nobled [Tue, 13 Jul 2010 02:53:32 +0000 (22:53 -0400)]
dri/nouveau: test for FEATURE defines

'struct dd_function_table' only conditionally contains
the function pointer NewFramebuffer and friends based on
FEATURE_EXT_framebuffer_* defines. (See src/mesa/main/dd.h)

Fixes the build when the features are disabled and the vfuncs
don't exist.

13 years agodri/radeon: test for FEATURE defines
nobled [Tue, 13 Jul 2010 01:22:08 +0000 (21:22 -0400)]
dri/radeon: test for FEATURE defines

'struct dd_function_table' only conditionally contains
the function pointer NewFramebuffer and friends based on
FEATURE_EXT_framebuffer_* defines. (See src/mesa/main/dd.h)

Fixes the build when the features are disabled and the vfuncs
don't exist.

13 years agox86: Remove unnecessary header from sse.h.
Vinson Lee [Mon, 16 Aug 2010 07:26:10 +0000 (00:26 -0700)]
x86: Remove unnecessary header from sse.h.

13 years agox86: Include missing headers in mmx.h.
Vinson Lee [Mon, 16 Aug 2010 06:29:09 +0000 (23:29 -0700)]
x86: Include missing headers in mmx.h.

Include compiler.h for _ASMAPI symbol.
Include mtypes.h for GLcontext symbol.

13 years agox86: Remove unnecessary header from 3dnow.h.
Vinson Lee [Mon, 16 Aug 2010 06:10:42 +0000 (23:10 -0700)]
x86: Remove unnecessary header from 3dnow.h.

13 years agoglsl: Clean up header file inclusion in slang_typeinfo.h.
Vinson Lee [Mon, 16 Aug 2010 05:44:29 +0000 (22:44 -0700)]
glsl: Clean up header file inclusion in slang_typeinfo.h.

Remove imports.h, mtypes.h, and slang_vartable.h.
Include glheader.h for GL symbols.

13 years agoglsl: Include missing header in slang_codegen.h.
Vinson Lee [Mon, 16 Aug 2010 05:39:51 +0000 (22:39 -0700)]
glsl: Include missing header in slang_codegen.h.

Include slang_vartable.h for slang_var_table symbol.

13 years agoglsl: Include missing header in slang_compile_operation.h.
Vinson Lee [Mon, 16 Aug 2010 05:38:23 +0000 (22:38 -0700)]
glsl: Include missing header in slang_compile_operation.h.

Include compiler.h for INLINE symbol.

13 years agoglsl: Clean up header file inclusion in slang_storage.h.
Vinson Lee [Mon, 16 Aug 2010 05:26:27 +0000 (22:26 -0700)]
glsl: Clean up header file inclusion in slang_storage.h.

Remove slang_compile.h.
Include glheader.h for GL symbols.
Include slang_compile_function.h for slang_function_scope symbol.
Include slang_compile_struct.h for slang_struct_scope symbol.
Include slang_compile_variable.h for slang_variable_scope symbol.
Include slang_typeinfo.h for slang_type_specifier symbol.
Include slang_utility.h for slang_atom_pool symbol.

13 years agoglsl: Clean up header file inclusion in slang_mem.h.
Vinson Lee [Mon, 16 Aug 2010 05:07:04 +0000 (22:07 -0700)]
glsl: Clean up header file inclusion in slang_mem.h.

slang_mem.h
Remove imports.h.
Include glheader.h for GL symbols.

slang_label.c
Include imports.h now that slang_mem.c does not include it.

13 years agoglsl: Clean up header file inclusion in slang_ir.h.
Vinson Lee [Mon, 16 Aug 2010 04:17:50 +0000 (21:17 -0700)]
glsl: Clean up header file inclusion in slang_ir.h.

Remove imports.h and slang_compile.h.
Include glheader.h for GL symbols.
Include slang_compile_variable.h for slang_variable symbol.

13 years agoglsl: Include missing header in slang_link.c.
Vinson Lee [Mon, 16 Aug 2010 04:13:32 +0000 (21:13 -0700)]
glsl: Include missing header in slang_link.c.

Include slang_compile.h for _slang_compile function.

13 years agoglsl: Include missing headers in slang_builtin.c.
Vinson Lee [Mon, 16 Aug 2010 04:10:16 +0000 (21:10 -0700)]
glsl: Include missing headers in slang_builtin.c.

Include slang_typeinfo.h for slang_type_specifier symbol.
Include slang_compiler_struct.h for slang_struct_ symbol.

13 years agor300g: fix an invalid pointer in free
Marek Olšák [Mon, 16 Aug 2010 03:05:43 +0000 (05:05 +0200)]
r300g: fix an invalid pointer in free