summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-08-25glcpp: Add GL_ARB_conservative_depth #define.Kenneth Graunke1-1/+3
Forgotten in the patch that enabled the extension. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2011-08-25i965: Remove all bits of NRM3 and NRM4 codeIan Romanick1-31/+0
Nothing in Mesa generates these opcodes, and i965 hardware cannot support it natively. If support were ever added for this opcode in Mesa, there had better be a lowering pass for hardware that doesn't support it natively.
2011-08-25glsl: fix crash when a const is passed to texelFetchOffsetDave Airlie1-0/+1
while debugging texelFetchOffset we kept hitting the assert. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-08-25glsl: Bail after reporting an error for non-constant const_in parameters.Kenneth Graunke1-0/+1
Otherwise we continue and hit the "Illegal formal parameter mode" assertion. Fixes negative compile test texelFetchOffset.frag in piglit. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-08-25pp: add files to Makefile.sourcesBrian Paul1-0/+6
2011-08-25Merge branch 'kasanen-post-process-v2'Brian Paul22-4/+4844
Conflicts: src/gallium/auxiliary/Makefile src/gallium/auxiliary/SConscript
2011-08-25softpipe: add const qualifier to silence warningsBrian Paul1-1/+1
2011-08-25glsl_to_tgsi: add TXF support. (v2)Dave Airlie1-3/+7
This adds texelFetch support to translate from GLSL to TGSI TXF opcode. I've tested this works with an r600g and softpipe backend. v2: drop comments, fix title, Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Bryan Cain <bryancain3@gmail.com>
2011-08-25softpipe: implement TXF support via get_texel callbackDave Airlie1-0/+69
This just calls the texel fetch functions directly bypassing the sampling, notes: 1: loops inside switch should be more optimal. 2: borders can be sampled though only up to border depth, outside that its undefined. Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-08-25tgsi: add TXF support.Dave Airlie2-1/+59
This is a straight texel fetch with no filtering or clamping. It uses integers to specify the i/j/k (from EXT_gpu_shader4). To enable this I had to add another hook into the tgsi sampler so that we could easily bypass all the filtering sample does. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2011-08-25glsl_to_tgsi: implement TXS/TXQ. (v2)Dave Airlie1-9/+18
GLSL uses TXS, call the gallium TXQ opcode. v2: fix indent from 4->3. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Bryan Cain <bryancain3@gmail.com>
2011-08-25softpipe: add get_dims callback for TXQ support. (v2)Dave Airlie1-0/+40
This adds the get_dims callback that is called from the tgsi exec_txq. It returns values as per EXT_gpu_program4. v2: fix one indent + use a switch (slighty modified from Brian) Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2011-08-25tgsi: add TXQ support. (v2)Dave Airlie2-1/+31
this adds another callback in the sampler struct containing get_dims entry point. This is used to query the driver for the texture resource dimensions for the resource bound to the current sampler. v2: remove unusued variable, fix indent Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-08-25glsl: Implement the GL_ARB_conservative_depth extension.Kenneth Graunke7-5/+9
It's the same as GL_AMD_conservative_depth. The specs have slight differences in wording, but don't differ in content or behavior. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2011-08-25Document the return type coding style.Kai Wasserbäch1-0/+10
As per discussion at [0] methods shouldn't use OpenGL return types, if they're not part of the GL API. [0] <http://marc.info/?l=mesa3d-dev&m=130754488901774&w=2> Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2011-08-25Change return type of try_emit_* methods to bool.Kai Wasserbäch2-9/+9
Ian Romanick explained (Message-Id: <4E528973.6080902@freedesktop.org>), that the return type of non-API methods shouldn't use GLboolean but a standard C++ bool. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Bryan Cain <bryancain3@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
2011-08-25d3d1x: save to correct slot in xs_set_constant_buffersChristoph Bumiller1-2/+2
2011-08-25d3d1x: fix xs_set_samplersChristoph Bumiller1-1/+2
2011-08-25android: add support for r600gChia-I Wu6-2/+143
Tested with a Radeon HD 6250. SurfaceFlinger (the display server and compositor) works. 2D apps with RGB or RGBA visuals work. As for 3D apps, some work but some don't (with serious rendering defects). Reviewed-by: Marek Olšák <maraeo@gmail.com>
2011-08-25winsys/radeon: share the source listChia-I Wu3-9/+7
Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile and SConscript share it. Reviewed-by: Marek Olšák <maraeo@gmail.com>
2011-08-25winsys/r600: share the source listChia-I Wu3-13/+10
Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile and SConscript share it. Reviewed-by: Marek Olšák <maraeo@gmail.com>
2011-08-25r600g: share the source listChia-I Wu3-31/+19
Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile and SConscript share it. Reviewed-by: Marek Olšák <maraeo@gmail.com>
2011-08-24glsl: Make sure that Extensions.dummy_true is set to trueIan Romanick1-0/+2
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Paul Berry <stereotype441@gmail.com>
2011-08-24vbo: remove unused var, remove unneeded local varBrian Paul1-4/+1
2011-08-24llvmpipe: add more restrict keywordsBrian Paul1-4/+4
Put restrict in the function definitions to silence MSVC warnings about incompatible assignments in "func = lp_tile_foobar;" when func was declared with restrict keywords but the rhs function wasn't. Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
2011-08-24docs: Document coding style conventionsPaul Berry1-0/+23
This patch documents some Mesa coding style conventions that came up during the discussion of commit 67b5a32 (Perform implicit type conversions on function call out parameters).
2011-08-24swrast: Remove swrast eject/validate texture image code.Brian Paul1-79/+0
No driver used the eject function, or set the validate hook that made that function do anything. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-08-24radeon: Fix flushing before writing a teximage's BO when !t->bo.Eric Anholt1-12/+12
Before, if we ended up here without a BO for our image, but did choose a miptree that had active rendering in the command buffer, our teximage data would jump ahead of the rendering using the old texture contents. This showed up as breakage in gen-teximage and friends in the following commit. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-08-24st/mesa: remove st_texture_image::face,level fieldsBrian Paul4-23/+17
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-08-24intel: use new gl_texture_image:Face, Level fieldsBrian Paul9-51/+34
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-08-24mesa: add gl_texture_image::Face, Level fieldsBrian Paul2-0/+5
Several drivers have these fields in their subclasses of gl_texture_image. They'll be useful for core Mesa too... Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-08-24x11: add missing comma to fix compilationBrian Paul1-1/+1
2011-08-24r600g: fill out missing entries in opcode tables.Dave Airlie1-0/+36
this just adds the missing opcodes as unsupported. Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-08-24winsys/svga: use os_mmap() for memory mappingChia-I Wu1-5/+6
os_mmap() guarantees large file support across OSes.
2011-08-24winsys/radeon: use os_mmap() for memory mappingChia-I Wu1-3/+3
os_mmap() guarantees large file support across OSes. Reviewed-by: Marek Olšák <maraeo@gmail.com>
2011-08-24auxiliary/os: add wrappers for mmap/munmapChia-I Wu1-0/+87
The use of mmap() in winsys requires large file support. Not all OSes have LFS so a wrapper should be used. In particular, os_mmap() should call __mmap2() on Android.
2011-08-23i965: Only map the necessary buffer range in brw_prepare_indicesIan Romanick1-3/+2
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2011-08-23tnl: Only map the necessary buffer range in bind_indicesIan Romanick1-5/+21
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
2011-08-23mesa: Only map the necessary buffer range in vbo_get_minmax_indexIan Romanick1-4/+19
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
2011-08-23mesa: Eliminate dd_function_table::MapBufferIan Romanick24-267/+123
Replace all calls to dd_function_table::MapBuffer with appropriate calls to dd_function_table::MapBufferRange, then remove all the cruft. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
2011-08-23radeon: Hack up an implementation of MapBufferRangeIan Romanick1-0/+33
This doesn't implement any of the "cool" features of MapBufferRange. Adding this function is necessary for the next commit in the series. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Cc: Maciej Cencora <m.cencora@gmail.com>
2011-08-23mesa: Fix incorrect access parameter passed to MapBufferIan Romanick2-6/+2
The code previously passed GL_DYNAMIC_DRAW for the access parameter. By inspection, I believe that all drivers would treat this as GL_READ_WRITE because it's not GL_READ_ONLY and it's not GL_WRITE_ONLY. It appears the i965 code wants GL_WRITE_ONLY (it's about to write a bunch of data in, never read data), while the arrayelt code is GL_READ_ONLY (just dereffed as arguments to CALL_Whatever*v). Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Keith Whitwell <keithw@vmware.com>
2011-08-23mesa: Remove target parameter from dd_function_table::FlushMappedBufferRangeIan Romanick5-8/+6
No driver used that parameter, and most drivers ended up with a bunch of unused-parameter warnings because it was there. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
2011-08-23intel: Correctly check for read-only mappings in intel_bufferobj_map_rangeIan Romanick1-1/+3
The old code was an obvious cut-and-paste fail from intel_bufferobj_map. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
2011-08-23mesa: Remove target parameter from dd_function_table::MapBufferRangeIan Romanick6-11/+7
No driver used that parameter, and most drivers ended up with a bunch of unused-parameter warnings because it was there. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
2011-08-23mesa: Remove target parameter from dd_function_table::GetBufferSubDataIan Romanick7-10/+6
No driver used that parameter, and most drivers ended up with a bunch of unused-parameter warnings because it was there. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
2011-08-23mesa: Remove target parameter from dd_function_table::BufferSubDataIan Romanick6-8/+5
No driver used that parameter, and most drivers ended up with a bunch of unused-parameter warnings because it was there. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
2011-08-23mesa: Remove target parameter from dd_function_table::MapBufferIan Romanick24-69/+40
No driver used that parameter, and most drivers ended up with a bunch of unused-parameter warnings because it was there. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
2011-08-23mesa: Remove target parameter from dd_function_table::UnmapBufferIan Romanick26-75/+53
No driver used that parameter, and most drivers ended up with a bunch of unused-parameter warnings because it was there. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
2011-08-23make: Add missing source file.José Fonseca1-0/+1