0ea49380e2
intel: Fix segfaults from trying to use _ColorDrawBuffers in FBO validation.
...
The _ColorDrawBuffers is a piece of computed state that gets for the
current draw/read buffers at _mesa_update_state time. However, this
function actually gets used for non-current draw/read buffers when
checking if an FBO is complete from the driver's perspective. So,
instead of trying to just look at the attachment points that are
currently referenced by glDrawBuffers, look at all attachment points
to see if they're driver-supported formats. This appears to actually
be more in line with the intent of the spec, too.
Fixes a segfault in my upcoming fbo-clear-formats piglit test, and
hopefully bug #30278
2011-01-04 10:04:15 -08:00
cd1cf78828
Merge remote branch 'origin/nvc0'
2011-01-04 18:20:05 +01:00
c94996f057
st/mesa: skip glDrawPixels/glBitmap-related code for ES build
...
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32560
2011-01-04 08:28:17 -07:00
4884ca5f67
nvc0: fix index size method value for u8 indices
2011-01-04 16:16:52 +01:00
2f08d872b2
nvc0: set the correct FP header bit for multiple colour outputs
2011-01-04 16:14:58 +01:00
6de94e1012
nvc0: delete memory caches and fence on screen destruction
2011-01-04 16:14:46 +01:00
471025929c
nvc0: use mov instead of ld for scalar const loads
2011-01-04 16:14:42 +01:00
c024c1d75f
nvc0: fix resource unmap after vertex push
2011-01-04 16:14:38 +01:00
e1e29395df
nvc0: use the proper typed opcodes in constant folding
2011-01-04 16:14:33 +01:00
92caa65c24
nvc0: demagic GP invocation count bitfield
2011-01-04 16:14:26 +01:00
997f84ff4e
nvc0: rewrite the 9097 GRAPH macros
2011-01-04 16:13:42 +01:00
6a102074bb
i965g: include brw_types.h instead of GL/gl.h
...
Alternately, some search&replace could be used to replace all
occurances of GLint with int, etc. in the driver.
2011-01-04 07:24:38 -07:00
c8a6a8bf2c
osmesa: pass context to _mesa_update_framebuffer_visual()
...
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32814
2011-01-04 07:13:52 -07:00
90b7a4cc1a
llvmpipe: Include p_compiler.h in lp_scene_queue.h.
...
Include p_compiler.h for boolean symbol.
2011-01-04 01:08:47 -08:00
f67dad7b82
llvmpipe: Include p_compiler.h in lp_perf.h.
...
Include p_compiler.h for int64_t symbol.
2011-01-04 01:01:18 -08:00
c72eb72ca6
llvmpipe: Include missing headers in lp_bld_depth.h
...
Include p_compiler.h for boolean symbol.
Include p_state.h for pipe_stencil_state symbol.
2011-01-04 00:54:14 -08:00
deb9a6ae79
llvmpipe: Include p_compiler.h in lp_bld_alpha.h.
...
Include p_compiler.h for boolean symbol.
Add forward declaration for gallivm_state struct.
2011-01-04 00:50:48 -08:00
7bfc54ea5d
i965g: Include p_compiler.h in intel_decode.h.
...
Include p_compiler.h for uint32_t symbol.
2011-01-04 00:44:23 -08:00
cf15e9b343
i965g: Include gl.h in intel_structs.h.
...
Include gl.h for OpenGL symbols.
2011-01-04 00:41:10 -08:00
bea6539abf
i965: Use last vertex convention for quad provoking vertex on sandybridge
...
Until we know how hw converts quads to polygon in beginning of
3D pipeline, for now unconditionally use last vertex convention.
Fix glean/clipFlat case.
2011-01-04 15:56:26 +08:00
9095947fa7
mesa: Include mtypes.h in renderbuffer.h.
...
Include mtypes.h for gl_buffer_index symbol.
This is a follow-up to commit 65da73c5f8
2011-01-03 22:42:12 -08:00
1df795f958
i965: Correct comment for gen6 fb write control message setting
...
Remove incorrect headless comment for gen6 fb write message.
Note current SIMD16 mode has already done right for control message.
2011-01-04 13:57:16 +08:00
9977297ad9
i965: Fix provoking vertex select in clip state for sandybridge
...
Triangle fan provoking vertex for first convention should be
'vertex 1' in sandybridge clip state.
Partly fix glean/clipFlat case
2011-01-04 13:51:39 +08:00
7bd2c5d1f9
mesa: fix AL44 texture fetch function nybble -> float conversion
...
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32804
2011-01-03 17:16:48 -07:00
30fef21aa3
intel: Use tri clears when we don't know how to blit clear the format.
...
Bug #32207 . Fixes ARB_texture_rg/fbo-clear-formats (see my
fbo-clear-formats piglit branch currently)
2011-01-03 13:28:26 -08:00
5f13c39484
mesa: Also report the number of renderbuffer alpha bits for GL_LUMINANCE_ALPHA.
...
Noticed by code inspection.
2011-01-03 13:28:26 -08:00
f45aea0ec9
mesa: Also report renderbuffer red/green size for GL_RED and GL_RG.
...
Noticed by code inspection.
2011-01-03 13:28:26 -08:00
059cca92a8
mesa: Use the common logic for "is this baseformat a color format?"
...
When figuring out whether a renderbuffer should be used to set the
visual bits of an FBO, we were missing important baseformats like
GL_RED, GL_RG, and GL_LUMINANCE.
2011-01-03 13:28:24 -08:00
beac6ee62a
mesa: Allow color renderbuffers besides just RGB and RGBA.
...
We did so already for textures to do ARB_fbo's
GL_ALPHA/GL_LUMINANCE/etc. support and for ARB_texture_rg's GL_RED and
GL_RG, but this path was missed.
2011-01-03 13:22:38 -08:00
2d29349c00
mesa: Update comment about the list of BaseFormats for gl_formats.
2011-01-03 13:22:38 -08:00
94ed481131
intel: Handle forced swrast clears before other clear bits.
...
Fixes a potential segfault on a non-native depthbuffer, and possible
accidental swrast fallback on extra color buffers.
2011-01-03 13:22:38 -08:00
efbd33aff9
st/mesa: fix renderbuffer pointer check in st_Clear()
...
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=30694
NOTE: This is a candidate for the 7.9 and 7.10 branches.
2011-01-03 14:01:41 -07:00
65da73c5f8
mesa: s/GLuint/gl_buffer_index/
2011-01-03 14:01:41 -07:00
35266fbe4f
st/mesa: 80-column wrapping
2011-01-03 14:01:41 -07:00
337f6e7b0e
st/mesa: 80-column wrapping
2011-01-03 14:01:41 -07:00
fb03510738
radeon: fix build on non-KMS systems.
...
Reported on irc by adamk.
2011-01-03 06:03:44 +10:00
1d40cf57f8
glsl: Really remove unused "instructions" parameter.
...
I forgot about this file, and it didn't show up until I tried to do
"make builtins" from a clean build.
2011-01-01 12:29:24 -08:00
81168351a7
glsl: Remove unused "instructions" parameter.
...
I think was used long ago, when we actually read the builtins into the
shader's instruction stream directly, rather than creating a separate
shader and linking the two. It doesn't seem to serve any purpose now.
2011-01-01 12:01:54 -08:00
1eceb9d323
mapi: add missing newline in error message
2010-12-31 16:37:41 -07:00
e227f4bf50
egl: add missing case in _eglError()
2010-12-31 09:14:25 -07:00
59051ad443
st/mesa: Handle wrapped depth buffers in st_copy_texsubimage().
2010-12-31 07:49:59 +01:00
8d79765feb
util: Add forward declarations in u_index_modify.h.
2010-12-30 01:54:35 -08:00
8114cf9ad8
tgsi: Clean up header file inclusion in tgsi_text.h.
2010-12-30 01:51:27 -08:00
8bfb9061b7
graw: Include p_shader_tokens.h for tgsi_token struct.
2010-12-30 01:49:26 -08:00
20a0f34283
tgsi: Clean up header file inclusion in tgsi_sanity.h.
2010-12-30 01:40:53 -08:00
79fa5acf26
x86: Clean up header file inclusion in mmx.h.
2010-12-30 01:26:47 -08:00
a1cd093a72
tnl: Clean up header file inclusion in t_vertex.h.
2010-12-30 01:05:33 -08:00
43c291683c
vbo: Clean up header file inclusion in vbo.h.
2010-12-30 00:57:03 -08:00
176a8359b9
tnl: Clean up header file inclusion in t_vp_build.h.
2010-12-30 00:50:56 -08:00
9db9761874
tnl: Clean up header file inclusion in tnl.h.
2010-12-30 00:46:13 -08:00
5b0e5e7389
drm/nvc0: don't un-bind every subchannel on init
...
The initial values in the grctx are 0x0000 anyway, and re-binding them
all to 0x0000 destroys some init done by the nouveau drm.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2010-12-30 12:34:12 +10:00
76db330e2c
util: add a way to store translated indices to a user memory in u_index_modify
...
I am about to use the upload buffer in r300g instead.
2010-12-29 18:32:41 +01:00
48ed458e87
r300g: support user buffers as constant buffers
2010-12-29 18:32:41 +01:00
df4d83dca4
i965: Do lowering of array indexing of a vector in the FS.
...
Fixes a regression in ember since switching to the native FS backend,
and the new piglit tests glsl-fs-vec4-indexing-{2,3} for catching this.
2010-12-28 17:32:20 -08:00
54df8e48bc
i965: Fix regression in FS comparisons on original gen4 due to gen6 changes.
...
Fixes 26 piglit cases on my GM965.
2010-12-28 15:35:00 -08:00
74dffb39c3
i965: Factor out the ir comparision to BRW_CONDITIONAL_* code.
2010-12-28 14:23:52 -08:00
f3319561a4
glcpp: Add negative tests for redefintions with valueless macros.
2010-12-27 23:20:35 -08:00
17004b3954
tgsi_dump: fix assert due to missing property name.
2010-12-28 16:52:19 +10:00
33e0b726e8
r300g: rename aos to vertex arrays
2010-12-28 04:52:36 +01:00
d9b84017e0
r300g: mark vertex arrays as dirty after a buffer_offset change
...
We shouldn't hit this bug in theory.
NOTE: This is a candidate for the 7.10 branch.
2010-12-28 04:40:05 +01:00
689aca7822
i965: Fix occlusion query on sandybridge
...
Clear target query buffer fixed occlusion query on sandybridge.
https://bugs.freedesktop.org/show_bug.cgi?id=32167
2010-12-28 11:11:40 +08:00
59fa8600d8
Revert "i965: upload multisample state for fragment program change"
...
This reverts commit de6fd527a5
2010-12-28 09:36:43 +08:00
6bb1e4541e
i965: Internally enable GL_NV_blend_square on ES2.
...
Hopefully should fix bug #32520 .
2010-12-27 15:44:52 -08:00
0cb6d1a4eb
nvc0: reference the vertex buffers
2010-12-27 21:00:40 +01:00
4fa429c876
nvc0: reenable some shader optimizations
...
CSE and constants folding.
2010-12-27 20:59:53 +01:00
a10b1c1204
nvc0: use VTX_ATTR for stride 0 vertex attributes
2010-12-27 13:59:43 +01:00
e4349027f6
nvc0: implement VRAM buffer transfers with bounce buffers
2010-12-27 13:57:46 +01:00
abd08f4c01
nvc0: init miptree transfer layer stride
2010-12-27 13:29:10 +01:00
b832ae8a4a
i965: don't spawn GS thread for LINELOOP on Sandybridge
...
LINELOOP is converted to LINESTRIP at the beginning of the 3D pipeline.
This fixes https://bugs.freedesktop.org/show_bug.cgi?id=32596
2010-12-27 17:05:58 +08:00
634a7dce9c
i965: Flatten if-statements beyond depth 16 on pre-gen6.
...
Gen4 and Gen5 hardware can have a maximum supported nesting depth of 16.
Previously, shaders with control flow nested 17 levels deep would
cause a driver assertion or segmentation fault.
Gen6 (Sandybridge) hardware no longer has this restriction.
Fixes fd.o bug #31967 .
2010-12-27 00:59:31 -08:00
9ac6a9b2fa
glsl: Support if-flattening beyond a given maximum nesting depth.
...
This adds a new optional max_depth parameter (defaulting to 0) to
lower_if_to_cond_assign, and makes the pass only flatten if-statements
nested deeper than that.
By default, all if-statements will be flattened, just like before.
This patch also renames do_if_to_cond_assign to lower_if_to_cond_assign,
to match the new naming conventions.
2010-12-27 00:59:31 -08:00
780fbecc20
nvc0: respond please inline to PIPE_SHADER_CAP_SUBROUTINES
2010-12-23 15:22:00 +01:00
96def0c314
nvc0: fix layer stride state
2010-12-23 15:21:36 +01:00
2c20aae233
nvc0: use most defs/decls from nouveau_pushbuf.h
2010-12-23 15:19:22 +01:00
82e0a38eed
nvc0: remove unused 'buf' parameter in pipe_buffer_unmap
2010-12-21 06:41:09 +10:00
317a1445c8
nvc0: BEGIN_RING->BEGIN_RING_NI in a couple of places
2010-12-21 06:33:17 +10:00
e4e1a85bf8
nvc0: fence.bo is mappable, mark it as such
2010-12-21 06:32:13 +10:00
e52ebd6e85
Merge remote branch 'origin/master' into nvc0-new
...
Conflicts:
src/gallium/drivers/nouveau/nouveau_winsys.h
2010-12-21 06:30:39 +10:00
5c102dd94f
nouveau: fix includes for latest libdrm
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2010-12-21 06:28:08 +10:00
abe9ffc25c
r600g: properly unset vertex buffer
...
Fix bug http://bugs.freedesktop.org/show_bug.cgi?id=32455
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2010-12-20 15:33:28 -05:00
a14f79f801
st/python: remove unused 'buf' parameter in pipe_buffer_unmap
...
This is a follow-up to commit ec51092a72
2010-12-20 11:40:54 -08:00
ec51092a72
gallium: remove unused 'buf' parameter in pipe_buffer_unmap
2010-12-20 17:42:55 +01:00
c451aade88
st/mesa: Remove comment cruft from st_context.h.
...
This was unintentionally added by commit
1525fb4afe
2010-12-20 01:24:26 -08:00
2dd788663a
st/mesa: Clean up header file inclusion in st_cb_texture.h.
2010-12-20 01:15:04 -08:00
10eb0c39d5
st/mesa: Clean up header file inclusion in st_cb_readpixels.h.
2010-12-20 01:00:26 -08:00
9f2cf89957
nvc0: s/INLIN_RING/IMMED_RING
2010-12-19 22:53:47 +01:00
608b3c4432
nvc0: improve shader support for texturing
...
Fixed shadow and cube texture fetches, add array texture fetches.
2010-12-19 21:49:32 +01:00
ca5deb0c35
nvc0: adapt to array textures interface change
2010-12-19 21:48:39 +01:00
0f68236a24
Merge remote branch 'origin/master' into nvc0-new
2010-12-19 21:46:33 +01:00
d047168d81
nvc0: fix clipping with scissors/viewport
...
Also setup optional path to use proper primitive clipping instead,
which is probably slower.
2010-12-19 21:42:00 +01:00
e9de2a31a5
nvc0: use BIND_RING to set subchannel classes
2010-12-19 21:40:24 +01:00
f0f1cce962
nvc0: switch to the proper constants upload path
...
Makes things suddenly go surprisingly fast.
2010-12-19 21:38:42 +01:00
99f9a9727c
nvc0: add the index buffer offset where missing
2010-12-19 21:33:37 +01:00
237880463d
r300g: optimize the fallback for misaligned ushort indices
2010-12-19 04:05:34 +01:00
c87f82bc40
st/mesa: Clean up header file inclusion in st_cb_program.h.
2010-12-18 01:44:52 -08:00
ac09685d2a
st/mesa: Clean up header file inclusion in st_cb_accum.h.
2010-12-18 01:28:18 -08:00
488e994ba9
mesa: Clean up header file inclusion in prog_statevars.h.
2010-12-18 01:16:53 -08:00
aa4d311873
mesa: fix queryobj whitespace.
...
Had done this before pushing but forgot to amend, doh.
2010-12-18 17:48:21 +10:00
ff7aa554a1
mesa/swrast/st: add ARB_occlusion_query2 support.
...
This gets my vote for most pointless extension of all time, I'm guessing
some driver could possibly optimise for this instead of counting it might
just get a true/false, but I'm not really sure.
need this to eventually advertise 3.3 despite its total uselessness.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-12-18 17:33:25 +10:00
7048095513
mapi: Clean up sources.mk.
...
Rename MAPI_GLAPI_SOURCES to MAPI_UTIL_SOURCES. Rename macro
MAPI_GLAPI_CURRENT to MAPI_MODE_UTIL. Update the comments to make it
clear that mapi may be used in two ways and how.
2010-12-18 15:05:58 +08:00
c17d4999f1
mapi: Clean up u_current interface.
...
Try not to use macros to make u_current.h appear to be glapi.h. Use
u_current.h to implement glapi.h instead whenever possible.
2010-12-18 15:05:52 +08:00
c7119e281b
mapi: Add ABI-tag note.
...
TLS requires kernel >= 2.4.20. Per glapi.
2010-12-18 14:46:10 +08:00
a954dbeb8c
Refresh autogenerated file builtin_function.cpp.
...
NOTE: The 7.9 and 7.10 branches will need their builtins refreshed too.
Rather than cherry-picking this commit, run 'make builtins'.
2010-12-17 19:40:56 -08:00
d7423a6531
glsl/builtins: Compute the correct value for smoothstep(vec, vec, vec).
...
These mistakenly computed 't' instead of t * t * (3.0 - 2.0 * t).
Also, properly vectorize the smoothstep(float, float, vec) variants.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
2010-12-17 19:29:22 -08:00
3f94d96fce
gallivm: Cleanup util_format_xxx_fetch_xxx call generation.
...
No need to register function prototypes in the module now that we call
the C function pointer directly -- less LLVM objects lying around.
Limited testing with lp_test_format.
2010-12-17 20:14:31 +00:00
5c229e5fbd
glsl: Expose a public glsl_type::void_type const pointer.
...
This is analogous to glsl_type::int_type and all the others.
2010-12-17 10:55:17 -08:00
daffaca53e
r300g: finally fix the texture corruption on r3xx-r4xx
...
Even though a bound texture stays bound when calling set_fragment_sampler_views,
it must be assigned a new cache region depending on the occupancy of other
texture units.
This fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=28800
Thanks to Álmos <aaalmosss@gmail.com> for finding the bug in the code.
NOTE: This is a candidate for both the 7.9 and 7.10 branches.
2010-12-17 13:17:52 +01:00
d0f8eea9a0
Remove OES_compressed_paletted_texture from the ES2 extension list.
...
We don't support it.
2010-12-16 17:40:50 -08:00
42a0967a36
softpipe: remove sp_tex_tile_cache_border_color()
...
With swizzling done at the end of texture sampling, we can greatly
simplify swizzling of the border color.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32460
2010-12-16 18:18:57 -07:00
9d9f8aba0a
softpipe: fix depth texture sampling regression
...
We need to keep using the pipe_get_tile_swizzle() even though there's
no swizzling because we need to explicitly pass in the surface format.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32459
2010-12-16 17:40:09 -07:00
3ecf47af12
gallivm: fix copy&paste error from previous commit
...
Fixes piglit regression, http://bugs.freedesktop.org/show_bug.cgi?id=32452
NOTE: This is a candidate for the 7.10 branch
2010-12-16 14:30:39 -07:00
fcc7024afe
r600c : inline vertex format is not updated in an app, switch to use vfetch constants. For the 7.9 and 7.10 branches as well.
2010-12-16 15:52:55 -05:00
290a1141bc
intel: Support glCopyTexImage() from XRGB8888 to ARGB8888.
...
The only mismatch between the two is that we have to clear the
destination's alpha to 1.0. Fixes WOW performance on my Ironlake,
from a few frames a second to almost playable.
2010-12-16 10:48:19 -08:00
ec03b316b4
intel: Try to sanely check that formats match for CopyTexImage.
...
Before, we were going off of a couple of known (hopeful) matches
between internalFormats and the cpp of the read buffer. Instead, we
can now just look at the gl_format of the two to see if they match.
We should avoid bad blits that might have been possible before, but
also allow different internalFormats to work without having to
enumerate each one.
2010-12-16 10:48:19 -08:00
e65c643792
intel: Drop commented intel_flush from copy_teximage.
...
The blit that follows appears in the command stream so it's serialized
with previous rendering. Any queued vertices in the tnl layer were
already flushed up in mesa/main/.
2010-12-16 10:48:19 -08:00
99c7840b0c
intel: Update renderbuffers before looking up CopyTexImage's read buffer.
...
Not fixing a particular bug, just noticed by code inspection.
2010-12-16 10:48:19 -08:00
ee16e97ed1
gallivm: work around LLVM 2.6 bug when calling C functions
...
Create a constant int pointer to the C function, then cast it to the
function's type. This avoids using trampoline code which seem to be
inadvertantly freed by LLVM in some situations (which leads to segfaults).
The root issue and work-around were found by José.
NOTE: This is a candidate for the 7.10 branch
2010-12-16 10:19:16 -07:00
b7e150605d
draw: s/varient/variant/
2010-12-16 10:18:24 -07:00
2bd9b386e6
svga: s/varient/variant/
2010-12-16 10:18:24 -07:00
bd75e4b8be
i965g: s/varient/variant/
2010-12-16 10:18:24 -07:00
a185d439bd
i915g: s/varient/variant/
2010-12-16 10:18:24 -07:00
f3955f6fcd
softpipe: s/varient/variant
2010-12-16 10:18:23 -07:00
aa5ba96d29
st/mesa: s/varient/variant
2010-12-16 10:18:23 -07:00
c52adfc2e1
i965: Set the alternative floating point mode on gen6 VS and WM.
...
This matches how we did the math instructions pre-gen6, though it
applies to non-math as well.
Fixes vp1-LIT test 2 (degenerate case: 0 ^ 0 -> 1)
2010-12-16 09:01:14 -08:00
2bd11ea119
i915: Fix INTEL_DEBUG=wm segmentation fault
...
The program should be disassembled after it's uploaded
2010-12-16 09:01:14 -08:00
23aa3c552c
svga, glhd: Remove incorrect assert and add note
...
Stride can be lower then the size of the attribute.
But should probably be aligned to component size atleast for floats.
2010-12-16 09:44:02 +01:00
1138775d79
svga: Minor debug text fix
2010-12-16 09:44:02 +01:00
c28debbf6f
svga: Remove debug print in winsys
2010-12-16 09:44:02 +01:00
486da2cfc0
svga: Correct spelling in swtnl backend
2010-12-16 09:44:01 +01:00
d7ff6dd09c
svga: Fix newline at EOF
2010-12-16 09:36:51 +01:00
f75549a9d8
svga: Add Galahad and Softpipe to scons build
2010-12-16 08:53:26 +01:00
0967d77a9a
wrapper: Flush pipe on unmap
...
For drivers that does DMA transfers instead of mapping directly
2010-12-16 08:53:26 +01:00
8b60bf4e9f
wrapper: Fix width and height given to map and remove uneeded fields
2010-12-16 08:53:26 +01:00
b7a73c72a6
i915g: Ignore color0 writes all cbufs tgsi property
2010-12-27 00:18:55 +01:00
9f2062fb12
st/egl: Fix eglChooseConfig when configs is NULL.
...
When configs is NULL, the app wants to know the number of matching
configs.
2010-12-26 23:35:50 +08:00
aa68dd9a49
swrast: Clean up header file inclusion in ss_vb.h.
2010-12-25 20:53:27 -08:00
da0bdc7cd5
swrast: Clean up header file inclusion in ss_triangle.h.
2010-12-25 20:48:29 -08:00
77d1d35163
swrast: Clean up header file inclusion in s_texfilter.h.
2010-12-25 20:28:17 -08:00
06fa986112
swrast: Clean up header file inclusion in s_texcombine.h.
2010-12-25 20:12:06 -08:00
77aaaf5fd5
swrast: Clean up header file inclusion in s_masking.h.
2010-12-25 20:03:33 -08:00
8ca0aca8dd
nvfx: Remove unused variable.
...
Fixes this GCC warning.
nvfx_vbo.c: In function 'nvfx_idxbuf_emit':
nvfx_vbo.c:410: warning: unused variable 'eng3d'
2010-12-25 19:09:54 -08:00
5f0f9f0486
nvfx: restore BEGIN_RING usage
...
Michel Hermier reported libdrm segfault (and kernel crash) on nv40 using
gallium :
http://www.mail-archive.com/nouveau@lists.freedesktop.org/msg06563.html
It turns out these were caused by some missing WAIT_RING (or wrong
computation of the WAIT_RING sizes). Unlike all other libdrm_nouveau users,
nvfx gallium tried to use a mininum calls of WAIT_RING, one WAIT_RING could
apply to many methods for different code paths and spread across several
functions. This made it too tricky to find out what the missing or wrong
WAIT_RING was.
By restoring BEGIN_RING, we force one WAIT_RING per method, and it's much
easier to check if the free size required in the pushbuffer is correct. As
curro said, "let's keep it simple for the maintainers until the big
bottlenecks are gone"
Benchmarked on nv35 with openarena, nexuiz and ut2004 and no performance
regression.
The core of this patch was made with Coccinelle, with minor manual fixes
made on top.
Tested-by: Michel Hermier <hermier@frugalware.org>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
2010-12-25 20:37:39 +01:00
b01b73c482
intel: Only do frame throttling at glFlush time when using frontbuffer.
...
This is the hack for input interactivity of frontbuffer rendering
(like we do for backbuffer at intelDRI2Flush()) by waiting for the n-2
frame to complete before starting a new one. However, for an
application doing multiple contexts or regular rebinding of a single
context, this would end up lockstepping the CPU to the GPU because
every unbind was considered the end of a frame.
Improves WOW performance on my Ironlake by 48.8% (+/- 2.3%, n=5)
2010-12-25 09:06:52 -08:00
b606c8a015
r300g: simplify buffer_transfer_inline_write
2010-12-25 16:07:13 +01:00
7e752760d4
r300g: simplify the code for buffer uploads
2010-12-25 16:07:13 +01:00
9c448817f7
r300g: user index buffers are always aligned
2010-12-25 16:07:13 +01:00
b10bff1135
r300g: increase the size of upload buffers
2010-12-25 16:07:13 +01:00
ecc6b7c002
swrast: Clean up header file inclusion in s_logic.h.
2010-12-24 20:43:35 -08:00
8dfeb98eb1
swrast: Clean up header file inclusion in s_fragprog.h.
2010-12-24 20:34:53 -08:00
3e2ea145b1
swrast: Clean up header file inclusion in s_span.h.
2010-12-24 20:17:18 -08:00
7d5f5d3843
swrast: Clean up header file inclusion in s_fog.h.
2010-12-24 20:11:44 -08:00
ec891d78a0
swrast: Clean up header file inclusion in s_depth.h.
2010-12-24 20:06:11 -08:00
b3c59acca6
swrast: Clean up header file inclusion in s_blend.h.
2010-12-24 19:55:42 -08:00
c9a0e25919
swrast: Clean up header file inclusion in s_atifragshader.h.
2010-12-24 19:47:54 -08:00
eadb90f045
swrast: Clean up header file inclusion in s_alpha.h.
2010-12-24 19:30:38 -08:00
ebe95d3796
swrast: Clean up header file inclusion in s_accum.h.
2010-12-24 19:25:30 -08:00
775e373dd9
swrast: Clean up header file inclusion in s_aatriangle.h.
2010-12-24 18:48:00 -08:00
d59075303a
swrast: Clean up header file inclusion in s_aaline.h.
2010-12-24 18:35:10 -08:00
499c77edf1
st/mesa: Clean up header file inclusion in st_mesa_to_tgsi.h.
2010-12-24 18:27:55 -08:00
b20dac4e2d
st/mesa: Clean up header file inclusion in st_gen_mipmap.h.
2010-12-24 18:06:20 -08:00
88550083b3
r300g/swtcl: re-enable LLVM
...
Based on a patch from Drill <drill87@gmail.com>.
NOTE: This is a candidate for the 7.10 branch.
2010-12-24 18:38:03 +01:00
8fc6c5fb36
r600g: r600_blit_uncompress_depth() can't fail.
2010-12-24 11:41:26 +01:00
878519b73e
r600g: Get rid of r600_blit_uncompress_depth_ptr.
2010-12-24 11:41:25 +01:00
a91a337a7d
mapi: Move mapi_func typedef to entry.h.
...
Make it clear that entry.h does not depend on stub.h.
2010-12-24 17:33:50 +08:00
a33e9f049d
mapi: Define MAPI_TMP_DEFINES only when needed.
...
Since struct mapi_table is opaque, MAPI_TMP_DEFINES is not needed in
table.h.
2010-12-24 17:33:49 +08:00
e6a7ef3ca6
mapi: Add and use entry_get_public.
...
Given a dispatch slot, entry_get_public returns the address of the
corresponding public entry point. There may be more than one of them.
But since they are all equivalent, it is fine to return any one of them.
With entry_get_public, the address of any public entry point can be
calculated at runtime when an assembly dispatcher is used. There is no
need to have a mapping table in such case. This omits the unnecessary
relocations from the binary.
2010-12-24 17:33:49 +08:00
897bff6773
mapi: Make struct mapi_stub opaque.
...
Add accessors for struct mapi_stub and make it opaque.
2010-12-24 17:28:52 +08:00
0c205484bf
mapi: Allow blocks to be disabled from the output.
...
For example, a printer may ask not to output noop dispatch table.
2010-12-24 17:28:52 +08:00
b765b1269f
mapi: Fix hidden entries.
...
Hidden entries are just like normal entries except that they are not
exported. Since it is not always possible to hide them, and two hidden
aliases can share the same entry, the name of hidden aliases are mangled
to '_dispatch_stub_<slot>'.
2010-12-24 17:28:52 +08:00
52ca153349
mapi: Add "handcode" attribute to the script.
...
Entries with handcode attribute will be handled normally, except no
entry point will be generated for them.
2010-12-24 17:28:52 +08:00
8eee1d522e
mapi: Minor ABIPrinter refactoring.
...
Split out function name generation from _c_decl to _c_function, and use
it everywhere. Add an optional 'export' argument to _cdecl. It is
prepended to the returned string.
2010-12-24 17:28:51 +08:00
86d29eab48
mapi: Store alias entry instead of alias name.
...
An entry can hold more info than plain name.
2010-12-24 17:28:51 +08:00
876effb0e7
r600g: hack around property unknown issues.
...
should fix https://bugs.freedesktop.org/show_bug.cgi?id=32619
Need to add proper support for properties later.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-12-24 17:34:40 +10:00
ac38ad6156
r300g: turn back on rv530 hiz.
...
still needs RADEON_HYPERZ=y env var.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-12-24 15:46:12 +10:00
7a5fac56b2
r300g: hyperz fixing typo.
...
Really no idea why I didn't see this before, but these values were opposite
the register spec.
this seems to fix rv530 HiZ on my laptop, will reenable in next commit.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-12-24 15:46:11 +10:00
a57e2c436b
mesa: Assert format is not MESA_FORMAT_COUNT in _mesa_format_to_type_and_comps.
...
The case of format being MESA_FORMAT_COUNT should never occur.
2010-12-23 18:19:42 -08:00
dc987adc9f
i965: use align1 access mode for instructions with execSize=1 in VS
...
All operands must be 16-bytes aligned in aligh16 mode. This fixes l_xxx.c
in oglconform.
2010-12-24 09:51:44 +08:00
8249321604
i965: fix register region description
...
This fixes
brw_eu_emit.c:179: validate_reg: Assertion `width == 1' failed.
2010-12-24 09:51:22 +08:00
1039f36c47
r600g: Rearrange print order of outputs of R600_ERR.
2010-12-23 17:26:36 -08:00
38eff56f7e
mesa: Assert _mesa_DeleteFragmentShaderATI doesn't ever free static DummyShader.
2010-12-23 16:44:42 -08:00
7f178ffbf1
st/egl: Remove unnecessary header.
2010-12-23 16:23:53 -08:00
070f5da96d
libgl-xlib: Remove unnecessary header.
2010-12-23 16:19:11 -08:00
075a807f43
r300g: Remove unnecessary header.
2010-12-23 16:05:28 -08:00
aaccb73276
tgsi_text: just parse as an integer (value is a boolean).
...
fixes warning reported by vlee on irc.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-12-24 09:29:19 +10:00
0b76255714
mapi: Remove unnecessary header.
2010-12-23 15:25:38 -08:00
bf4dffb8ef
intel: Remove unnecessary headers.
2010-12-23 15:08:53 -08:00
4e52e8f746
r300g: add support for color0 writes to all bound color buffers.
...
Thanks to Marek Olšák for making my initial attempt actually work.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-12-24 07:19:58 +10:00
07498075b5
mesa/st: set the color write cbuf property for fragColor writes
2010-12-24 07:19:58 +10:00
2f4860f2ab
softpipe: add support for color writes all color bufs property
2010-12-24 07:19:57 +10:00
c9c8a5ed02
gallium: add fragment shader property for color writes to all buffers. (v2)
...
For GL fragColor semantics we need to tell the pipe drivers that the fragment
shader color result is to be replicated to all bound color buffers, this
adds the basic TGSI + documentation.
v2: fix missing comma pointed out by Tilman on mesa-dev.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-12-24 07:19:57 +10:00
eccffe2328
i965: Remove unnecessary headers.
2010-12-23 11:54:29 -08:00
280750c5ca
mesa: Fix #ifdef typo in _mesa_format_to_type_and_comps.
...
According to the comment, the warning should be for debug builds.
2010-12-23 11:32:16 -08:00
aedbf05d31
r300g: use a simpler fallback for misaligned ushort indices with triangles
...
If 'start' is odd, render the first triangle with indices embedded
in the command stream, which adds 3 to 'start' and makes it even.
Then continue with the fast path.
2010-12-23 16:54:59 +01:00
c420c0e7d6
r300g: add support for B2G3R3 texturing
2010-12-23 16:54:59 +01:00
bf7b6f60ae
mesa: fix texel store functions for some float formats
...
These are copy-paste errors obviously.
2010-12-23 16:54:58 +01:00
4a710469e0
st/mesa: do not require all texture formats to be renderable
...
This is a bandaid on the problem that if some formats were not renderable
(like luminance_alpha), st/mesa fell back to some RGBA format, so basically
some non-renderable formats were actually not used at all. This is only
a problem with hardware drivers, softpipe can render to anything.
Instead, require only RGB8/RGBA8 to be renderable.
2010-12-23 16:54:58 +01:00
998657112b
st/mesa: use the formats RGB233, ARGB2101010, AL44, AL1616, A16, L16, I16
2010-12-23 16:54:58 +01:00
a780490374
gallium: add new formats L16A16_UNORM, A16_UNORM, I16_UNORM, B2G3R3_UNORM
2010-12-23 16:54:58 +01:00
fd8aa7ac71
mesa: implement new texture format I16
2010-12-23 16:54:58 +01:00
bb5ace68ce
mesa: implement new texture format L16
2010-12-23 16:54:58 +01:00
eb31837a0d
mesa: implement new texture format A16
2010-12-23 16:54:58 +01:00
bae9d511f3
mesa: implement new texture format AL44
...
Radeon GPUs can do this. R600 can even do render-to-texture.
Packing and extracting aren't implemented, but we shouldn't hit them (I think).
Tested with swrast, softpipe, and r300g.
2010-12-23 16:54:58 +01:00
621e5254ef
mesa: implement new texture format ARGB2101010
...
Radeon GPUs do support GL_RGB10_A2.
2010-12-23 16:54:58 +01:00
0a7b60f7ed
st/mesa: if Z32 is unsupported, prefer Z24 to Z16
2010-12-23 16:54:58 +01:00
888e59fce8
st/mesa: use RGBA16 for RGB12 and RGB16
...
To provide enough precision if a user wants it.
2010-12-23 16:54:58 +01:00
3f9e78ac39
st/mesa: use DXT SRGB formats for COMPRESSED_SRGB
...
And also check if the formats are supported to return something meaningful
if compression cannot be used.
2010-12-23 16:54:57 +01:00
bf15ad3782
i965: Keep around a copy of the VS constant surface dumping code.
...
Just like everywhere else, I never trust my constant uploads to
correctly put constants in the right places, even though that's so
rarely where the issue is.
2010-12-23 01:32:44 -08:00
5dc53444c8
i965: Correct the dp_read message descriptor setup on g4x.
...
It's mostly like gen4 message descriptor setup, except that the sizes
of type/control changed to be like gen5. Fixes 21 piglit cases on
gm45, including the regressions in bug #32311 from increased VS
constant buffer usage.
2010-12-23 01:32:43 -08:00
de6fd527a5
i965: upload multisample state for fragment program change
...
This makes conformance tests stable on sandybridge D0 to track
multisample state before SF/WM state.
2010-12-23 17:30:03 +08:00
845d651cf6
i965: Use MI_FLUSH_DW for blt ring flush on sandybridge
...
Old MI_FLUSH command is deprecated on sandybridge blt.
2010-12-23 17:29:46 +08:00
1e7bfcc707
st/mesa: Remove unnecessary header.
2010-12-23 01:03:32 -08:00
492afbce18
gallivm: Disable MMX-disabling code on llvm-2.9.
...
The disable-mmx option was removed in llvm-2.9svn by revisions 122188
and 122189.
Fixes FDO bug 32564.
2010-12-22 19:56:10 -08:00
adaa310e39
gallivm: Fix 'cast from pointer to integer of different size' warning.
...
Fixes this GCC warning.
lp_bld_const.h: In function 'lp_build_const_int_pointer':
lp_bld_const.h:137: warning: cast from pointer to integer of different size
2010-12-22 16:48:19 -08:00
38c8b034e2
i915g: Remove unnecessary header.
2010-12-22 00:57:52 -08:00
442fcd0620
llvmpipe: Remove unnecessary headers.
2010-12-22 00:55:41 -08:00
013fc33462
r300g: Remove unnecessary headers.
2010-12-22 00:52:05 -08:00
f39d0c791a
svga: Remove unnecessary header.
2010-12-22 00:42:23 -08:00
a91128030e
st/vega: Remove unnecessary headers.
2010-12-22 00:38:42 -08:00
ca8b4ca478
r600g: Remove the unused "pframebuffer" field from r600_pipe_context.
2010-12-22 09:19:48 +01:00
2fd718d560
r600g: r600_new() and r600_delete() are unused.
2010-12-22 09:19:48 +01:00
4374703a9b
i965: explicit tell header present for fb write on sandybridge
...
Determine header present for fb write by msg length is not right
for SIMD16 dispatch, and if there're more output attributes, header
present is not easy to tell from msg length. This explicitly adds
new param for fb write to say header present or not.
Fixes many cases' hang and failure in GL conformance test.
2010-12-22 11:08:51 -05:00
445cb9e53b
st/egl: Assorted fixes for dri2_display_get_configs.
...
Set window_bit only when the visual id is greater than zero. Correct
visual types. Skip slow configs as they are not relevant. Finally, do
not return duplicated configs.
2010-12-22 16:05:27 +08:00
341d048e45
r600g: remove useless switch statements
...
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2010-12-22 01:30:41 -05:00
a31e2e3312
st/egl: Fix eglCopyBuffers.
...
Flush before presenting.
2010-12-22 14:21:47 +08:00
18bc427ade
st/egl: Plug pbuffer leaks.
...
Unreference validated resources or remove unnecessary validations.
2010-12-22 14:12:33 +08:00
0fb2dcc98f
st/egl: Allow single-buffered pixmaps.
...
All single-buffered configs were ignored before to make sure
EGL_RENDER_BUFFER is settable for window surfaces. It is better to
allow single-buffered configs and set EGL_WINDOW_BIT only for
double-buffered ones. This way there can be single-buffered pixmaps.
2010-12-22 14:12:33 +08:00
f431e0452b
r600g: drop unused code in evergreen.
...
this code was pretty much duplicated, thanks to Henri Verbeet on irc for
pointing it out.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-12-22 15:58:29 +10:00
975b7ef92a
st/egl: Remove native_config::samples.
...
Multisample buffers are never requested.
2010-12-22 13:22:36 +08:00
3a93c34828
st/egl: Remove native_config::slow_config.
...
In direct rendering scenario, it is not needed until an EGLDisplay can
support both HW and SW pipe screens.
2010-12-22 13:22:36 +08:00
0364c08d7f
st/egl: Remove unnecessary egl_g3d_find_pixmap_config.
...
It was used to find a compatible config for a given pixmap. Now that a
config is optional for pixmap surface creation, the function is not
needed.
2010-12-22 13:22:36 +08:00
af767ee113
st/egl: Make config optional for create_pixmap_surface.
...
eglCopyBuffers or EGL_KHR_image_pixmap require creating a pixmap surface
without a config. Make it just work without relying on
is_pixmap_supported.
2010-12-22 13:22:36 +08:00
2dd189a824
r600g: fix evergreen segfaults.
...
evergreen was crashing running even gears here.
This is a 7.10 candidate if its broken the same.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-12-22 14:54:17 +10:00
cb4f367b26
r300g: fix precision issues with B10G10R10A2
2010-12-22 03:39:37 +01:00
2a95542088
r300g: support B10G10R10A2 render targets only with DRM 2.8.0 or later versions
2010-12-22 03:39:37 +01:00
4fe78d3e12
i965: Avoid using float type for raw moves, to work around SNB issue.
...
The SNB alt-mode math does the denorm and inf reduction even for a
"raw MOV" like we do for g0 message header setup, where we are moving
values that aren't actually floats. Just use UD type, where raw MOVs
really are raw MOVs.
Fixes glxgears since c52adfc2e1
2010-12-21 13:06:15 -08:00
fa62cf7450
r600g: avoid segfault
...
Candidates 7.10
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2010-12-21 10:51:32 -05:00
8b9570e685
intel: Check for unsupported texture when finishing using as a render target
...
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32541
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-12-21 11:58:35 +00:00
c1f0f90a97
st/mesa: Clean up header file inclusion in st_format.h.
2010-12-21 01:25:04 -08:00
3d03b4d839
st/mesa: Clean up header file inclusion in st_draw.h.
2010-12-21 01:17:37 -08:00
57dcd800ca
nvfx: fix fragprog word swapping on big-endian machines
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2010-12-16 11:13:21 +10:00
dbb679e51d
gallium: properly check for src->dst blit compatibilities
...
Spotted by Christoph Bumiller & Jose Fonseca
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2010-12-15 15:29:31 -05:00
66f55de31e
r600g: fix pow(0, 0) evaluating to NaN
...
We have to use the non-IEEE compliant version of MUL here, since
log2(0) is -inf, and 0 * -inf is NaN in IEEE arithmetic.
candidates for 7.10 branch
2010-12-15 14:07:00 -05:00
3861a1001c
r600g: need to reference upload buffer as the might still live accross flush
...
Can't get away from referencing upload buffer as after flush a vertex buffer
using the upload buffer might still be active. Likely need to simplify the
pipe_refence a bit so we don't waste so much cpu time in it.
candidates for 7.10 branch
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2010-12-15 12:07:09 -05:00
a8ca30bc58
st/mesa: fix incorrect prev pointer in destroy_program_variants()
2010-12-14 14:15:22 -07:00
c62bb90d6a
softpipe: do texture swizzle during texture sampling
...
Instead of when we read texture tiles. Now swizzling happens after
the shadow depth compare step. This fixes the piglit glsl-fs-shadow2d*
tests (except for proj+bias because of a GLSL bug).
2010-12-14 13:01:03 -07:00
be2aa81f5f
mesa: more program debug code
2010-12-14 12:46:01 -07:00
2a77c3cc0b
tgsi: document texture opcodes
2010-12-14 12:45:36 -07:00
bb10e081c8
glsl: new glsl_strtod() wrapper to fix decimal point interpretation
...
We always want to use '.' as the decimal point.
See http://bugs.freedesktop.org/show_bug.cgi?id=24531
NOTE: this is a candidate for the 7.10 branch.
2010-12-14 12:38:38 -07:00
dfbc20593e
gallivm: do texture swizzle after shadow compare
...
We need to swizzle after the shadow comparison so that the GL_DEPTH_MODE
functionality is handled properly.
This fixes all the piglit glsl-fs-shadow2d*.shader_test cases, except
for glsl-fs-shadow2dproj-bias.shader_test which fails because of a
bug in the GLSL compiler (fd.o 32395).
2010-12-14 12:17:10 -07:00
68c41a25b4
st/mesa: rename the varient release functions
2010-12-14 12:17:10 -07:00
Eric Anholt
Christoph Bumiller
Brian Paul
Vinson Lee
Zhenyu Wang
Dave Airlie
Kenneth Graunke
Henri Verbeet
Ben Skeggs
Marek Olšák
Dave Airlie
Xiang, Haihao
Jerome Glisse
Chia-I Wu
José Fonseca
richard
Shuang He
Jakob Bornecrantz
Jakob Bornecrantz
Xavier Chantry
Alex Deucher
Chris Wilson
Fredrik Höglund