| 1c0f1dd42a50464eeb81de4aad8eecf24b3d6c89 |
|
26-Jan-2012 |
Chad Versace <chad.versace@linux.intel.com> |
swrast: Fix fixed-function fragment processing
On i965, _mesa_ir_link_shader is never called. As a consequence, the
current fragment program (ctx->FragmentProgram->_Current) exists but is
invalid because it has no instructions. Yet swrast continued to attempt to
use the empty program.
To avoid using the empty program, this patch 1) defines a new function,
_swrast_use_fragment_program, which checks if the current fragment program
exists and differs from the fixed function fragment program, and, when
appropriate, 2) replaces checks of the form
if (ctx->FragmentProgram->_Current == NULL)
with
if (_swrast_use_fragment_program(ctx))
Fixes the following oglconform regressions on i965/gen6:
api-fogcoord(basic.allCases.log)
api-mtexcoord(basic.allCases.log)
api-seccolor(basic.allCases.log)
api-texcoord(basic.allCases.log)
blend-separate(basic.allCases)
colorsum(basic.allCases.log)
The tests were ran with the GLXFBConfig:
visual x bf lv rg d st colorbuffer sr ax dp st accumbuffer ms cav
id dep cl sp sz l ci b ro r g b a F gb bf th cl r g b a ns b eat
----------------------------------------------------------------------------
0x021 24 tc 0 32 0 r y . 8 8 8 8 . . 0 24 8 0 0 0 0 0 0 None
(Note: I originally believed that the hunk in
_swrast_update_fragment_program was unnecessary. But it is required to fix
blend-separate.)
Note: This is a candidate for the 8.0 branch.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43327
Reveiwed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <idr@freedesktop.org>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 9520f483b8f1e45fa474674b415554988de5d8d3 |
|
01-Oct-2011 |
Brian Paul <brianp@vmware.com> |
mesa: s/INLINE/inline/
INLINE is still seen in some files (some generated files, etc) but this
is a good start.
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| f9995b30756140724f41daf963fa06167912be7f |
|
12-Oct-2010 |
Kristian Høgsberg <krh@bitplanet.net> |
Drop GLcontext typedef and use struct gl_context instead
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| e5ed4c45c675ebdd595ad0d31f2835f8b2b8dc57 |
|
25-Feb-2010 |
Ian Romanick <ian.d.romanick@intel.com> |
swrast: Remove support for rendering antialiased lines into a color-index buffer
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| bbd287103dad776d8a45c87c4e51fbc26d9b80d5 |
|
18-Sep-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
mesa: prefix a bunch of #include lines with "main/".
This is another step toward removing a whole bunch of -I flags from
the cc commands. Still need to address driver code...
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 9e8a961dd7d7b717a9fb4ecdea1c1b60ea355efe |
|
20-May-2007 |
Brian <brian@yutani.localnet.net> |
Overhaul/simplify SWvertex and SWspan attribute handling.
Instead of separate fog/specular/texcoord/varying code, just treat all of
them as generic attributes. Simplifies the point/line/triangle functions.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| eca456b63d41700617987ba45a09e8f2168b9577 |
|
25-Apr-2007 |
Brian <brian@yutani.localnet.net> |
s/DO_TEXVAR/DO_ATTRIBS/
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| dd34fe8679fa200e55cfaf8e80bbecdecea084e3 |
|
05-Feb-2007 |
Brian <brian@nostromo.localnet.net> |
Merge SWvertex texcoord and varying fields into attrib[] array field.
Fragment texcoords and varying code is now unified in the point/line/triangle
rasterization code. In the future, merge color, fog, etc. attribs.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| cdb27e8242215271364602995d85607cfc06d441 |
|
01-Oct-2006 |
Brian Paul <brian.paul@tungstengraphics.com> |
New SWspan and SWspanarrays typedefs.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| b3aefd1cfb6aacd1695c52911dd39da50d893ece |
|
19-Sep-2005 |
Brian Paul <brian.paul@tungstengraphics.com> |
additional wrapper updates, bug 4468
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 1e4731f6443a6efdfc4e425977490ddd5387caa3 |
|
09-Mar-2004 |
Brian Paul <brian.paul@tungstengraphics.com> |
Fix color index mode rendering.
Changed SWvertex's index field to GLfloat and fix a few other bits.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 36a0a3252e1e20df69b53f70ba93bc74c4a4bf0e |
|
08-Apr-2003 |
Brian Paul <brian.paul@tungstengraphics.com> |
Added ctx->Texture._EnabledCoordUnits bitfield.
Fixed some vertex array / vertex program glitches with glDrawElements.
Fixed some fragment program runtime bugs.
Non-trivial Cg programs are running now.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| a2da1155c285fde2a5e5824d50ee8a57c6e982f5 |
|
14-Mar-2003 |
Brian Paul <brian.paul@tungstengraphics.com> |
include macros.h
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 27558a160a9fe91745728d7626995cd88f8fe339 |
|
01-Mar-2003 |
Brian Paul <brian.paul@tungstengraphics.com> |
Killed mmath.[ch]. Moved low-level functions/assembly code into imports.[ch]
Moved type conversion and interpolation macros into macros.h
Updated all the files that used to include mmath.h
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| a20ed720032d1a04a5206374020234140dd5ef08 |
|
28-Feb-2003 |
Brian Paul <brian.paul@tungstengraphics.com> |
fix GLchan==GLfloat bug in solve_plane_chan (bug 694546)
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 13c4c046a5ff6130fa27385bb93d2464e0ff0f83 |
|
28-Feb-2003 |
Brian Paul <brian.paul@tungstengraphics.com> |
fix a cast (bug 694546)
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 610d59981a9f43fefe29b34ef19c184d28e2bef5 |
|
14-Jan-2003 |
Brian Paul <brian.paul@tungstengraphics.com> |
First batch of code for GL_NV_fragment_program.
Re-org of some GL_NV_vertex_program code.
Replace MAX_TEXTURE_UNITS with MAX_TEXTURE_COORD_UNITS and MAX_TEXTURE_IMAGE_UNITS.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 77df88727cb0a423dd5cb41498c2302d9df4fce7 |
|
07-Aug-2002 |
Brian Paul <brian.paul@tungstengraphics.com> |
struct sw_span is again allocated on the stack, but the arrays of span
data are broken out into a new struct span_arrays which is allocated
per-context (to avoid huge stack allocations - a problem on Windows).
This lets us use span.redStep instead of span->redStep (for example) to
hopefully get slightly better performance in the triangle functions.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 8afe7de8deaf3c9613fd68b344de8c52b02b1879 |
|
15-Jun-2002 |
Brian Paul <brian.paul@tungstengraphics.com> |
Implemented GL_NV_texture_rectangle extension.
Replace struct gl_texure_object's Dimension w/ Target field.
Added _EnabledUnits to struct gl_texture_attrib - the _ReallyEnabled
field is obsolete, but still present for now. This effectively
removes the 8-texture units limit, 32 units now possible, but unlikely!
New TEXTURE_1D/2D/3D/CUBE/RECT_BIT tokens for unit->_ReallyEnabled field.
Updated device drivers to use ctx->Texture._EnabledUnits.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| bf80e1ed620836e2ca0dd3f7d2d4cb187d17563d |
|
19-Apr-2002 |
Brian Paul <brian.paul@tungstengraphics.com> |
Allocate a sw_span struct in the swrast context instead of allocating it
on the stack frame in the point/line/triangle functions. (Klaus Niederkrueger)
This should solve the performance problem Karl found on Windows.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 733a4b602bbbfda83ee03b7ae4f3737bbe659034 |
|
02-Feb-2002 |
Brian Paul <brian.paul@tungstengraphics.com> |
sw_span can now hold x/y arrays of fragment positions - getting ready to
ditch the pb (pixel buffer) code.
Converted point drawing, bitmaps and aa lines to use new span functions.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 7b9fe820a3fba3849864682fbb1cb512362934ab |
|
19-Sep-2001 |
Karl Schultz <kschultz@freedesktop.org> |
more compiler warning fixes
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 6b1e4ea5a54ea852a904440cd9fa50251f63f64c |
|
21-May-2001 |
Brian Paul <brian.paul@tungstengraphics.com> |
fixed a number of multi-texture line bugs
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 89dae684aa1d74b06a4f70cb76b33671d0cef9e6 |
|
17-May-2001 |
Keith Whitwell <keith@tungstengraphics.com> |
Fix order of decomposition of quad.
Remove 'swrast->_MultiTexEnabled' derived value.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| dbed2027444338dc09fc102d6f4bd5c707c238d7 |
|
10-May-2001 |
Brian Paul <brian.paul@tungstengraphics.com> |
fixed some divide by zero problems found w/ conform
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 6ac852d45b3a53dc51414773454e6bae7126fe33 |
|
10-Apr-2001 |
Brian Paul <brian.paul@tungstengraphics.com> |
fixed some divide by zero conformance problems
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| f1f288182ec07eddeefa591fce20fe69ce3744e2 |
|
28-Mar-2001 |
Brian Paul <brian.paul@tungstengraphics.com> |
adjustment to coverage sample positions
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 22144ab7552f0799bcfca506bf4ffa7f70a06649 |
|
12-Mar-2001 |
Gareth Hughes <gareth@valinux.com> |
Consistent copyright info (version number, date) across all files.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| b51b0a847d7e7daaea69f77ab569086ef81c24a2 |
|
07-Mar-2001 |
Brian Paul <brian.paul@tungstengraphics.com> |
fixed a bunch of g++ warnings/errors. Compiling with g++ can help find lots of potential problems
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| b6bcae5698df88f7730d40004ce7ce0462e97a20 |
|
24-Jan-2001 |
Brian Paul <brian.paul@tungstengraphics.com> |
Replaced struct gl_visual with struct __GLcontextModesRec from glcore.h.
Replace "RGBAMode" with "rgbMode", etc.
Other minor clean-ups.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 5e3bc0c2a2bcdf59949410f94c9b705fc1281ce8 |
|
22-Nov-2000 |
Jouk Jansen <joukj@hrem.stm.tudelft.nl> |
Committing in .
Modified Files:
Mesa/macos/gli_api/gliapi1.h Mesa/macos/gli_api/gliapi2.h
Mesa/macos/gli_api/gliapiext.h Mesa/macos/src-gli/fxgli.c
Mesa/macos/src-gli/fxgli.h Mesa/macos/src-gli/fxgli2.c
Mesa/macos/src-gli/fxgli_tridebug.c Mesa/src/accum.c
Mesa/src/accum.h Mesa/src/all.h Mesa/src/alpha.c
Mesa/src/alpha.h Mesa/src/attrib.c Mesa/src/attrib.h
Mesa/src/bitmap.c Mesa/src/bitmap.h Mesa/src/blend.c
Mesa/src/blend.h Mesa/src/buffers.c Mesa/src/buffers.h
Mesa/src/clip.c Mesa/src/clip.h Mesa/src/colortab.h
Mesa/src/config.c Mesa/src/context.c Mesa/src/context.h
Mesa/src/convolve.c Mesa/src/convolve.h Mesa/src/copypix.c
Mesa/src/copypix.h Mesa/src/debug.c Mesa/src/depth.c
Mesa/src/depth.h Mesa/src/dlist.c Mesa/src/dlist.h
Mesa/src/drawpix.c Mesa/src/drawpix.h Mesa/src/enable.c
Mesa/src/enable.h Mesa/src/eval.c Mesa/src/eval.h
Mesa/src/extensions.c Mesa/src/extensions.h
Mesa/src/feedback.c Mesa/src/feedback.h Mesa/src/fog.c
Mesa/src/fog.h Mesa/src/get.c Mesa/src/get.h Mesa/src/glapi.c
Mesa/src/glthread.h Mesa/src/highpc.c Mesa/src/hint.h
Mesa/src/histogram.h Mesa/src/image.c Mesa/src/image.h
Mesa/src/imports.c Mesa/src/light.c Mesa/src/light.h
Mesa/src/lines.c Mesa/src/lines.h Mesa/src/logic.c
Mesa/src/logic.h Mesa/src/masking.c Mesa/src/masking.h
Mesa/src/matrix.c Mesa/src/matrix.h Mesa/src/pixel.c
Mesa/src/pixel.h Mesa/src/points.c Mesa/src/points.h
Mesa/src/polygon.c Mesa/src/polygon.h Mesa/src/rastpos.c
Mesa/src/readpix.c Mesa/src/scissor.c Mesa/src/scissor.h
Mesa/src/state.c Mesa/src/state.h Mesa/src/stencil.c
Mesa/src/stencil.h Mesa/src/teximage.c Mesa/src/teximage.h
Mesa/src/texobj.c Mesa/src/texobj.h Mesa/src/texstate.c
Mesa/src/texstate.h Mesa/src/texture.c Mesa/src/texture.h
Mesa/src/texutil.c Mesa/src/texutil.h Mesa/src/varray.c
Mesa/src/varray.h Mesa/src/X/fakeglx.c Mesa/src/X/xm_api.c
Mesa/src/X/xm_dd.c Mesa/src/X/xm_line.c Mesa/src/X/xm_span.c
Mesa/src/X/xm_tri.c Mesa/src/swrast/s_aaline.c
Mesa/src/swrast/s_aaline.h Mesa/src/swrast/s_aatriangle.h
Mesa/src/swrast/s_accum.h Mesa/src/swrast/s_alpha.h
Mesa/src/swrast/s_alphabuf.h Mesa/src/swrast/s_blend.h
Mesa/src/swrast/s_context.c Mesa/src/swrast/s_context.h
Mesa/src/swrast/s_depth.h Mesa/src/swrast/s_drawpix.h
Mesa/src/swrast/s_feedback.h Mesa/src/swrast/s_fog.h
Mesa/src/swrast/s_histogram.h Mesa/src/swrast/s_lines.h
Mesa/src/swrast/s_logic.h Mesa/src/swrast/s_masking.h
Mesa/src/swrast/s_pb.h Mesa/src/swrast/s_pixeltex.h
Mesa/src/swrast/s_points.h Mesa/src/swrast/s_quads.c
Mesa/src/swrast/s_quads.h Mesa/src/swrast/s_scissor.h
Mesa/src/swrast/s_span.h Mesa/src/swrast/s_stencil.h
Mesa/src/swrast/s_texture.h Mesa/src/swrast/s_triangle.h
Mesa/src/swrast/s_zoom.h Mesa/src/swrast/swrast.h
Mesa/src/swrast_setup/ss_context.h
Mesa/src/swrast_setup/ss_triangle.c
Mesa/src/swrast_setup/ss_triangle.h
Mesa/src/swrast_setup/ss_vb.h Mesa/src/tnl/t_clip.c
Mesa/src/tnl/t_clip.h Mesa/src/tnl/t_context.c
Mesa/src/tnl/t_context.h Mesa/src/tnl/t_cva.c
Mesa/src/tnl/t_cva.h Mesa/src/tnl/t_debug.c
Mesa/src/tnl/t_debug.h Mesa/src/tnl/t_dlist.h
Mesa/src/tnl/t_eval.c Mesa/src/tnl/t_eval.h
Mesa/src/tnl/t_fog.c Mesa/src/tnl/t_fog.h
Mesa/src/tnl/t_light.c Mesa/src/tnl/t_light.h
Mesa/src/tnl/t_pipeline.c Mesa/src/tnl/t_pipeline.h
Mesa/src/tnl/t_shade.c Mesa/src/tnl/t_shade.h
Mesa/src/tnl/t_stages.c Mesa/src/tnl/t_stages.h
Mesa/src/tnl/t_texture.c Mesa/src/tnl/t_texture.h
Mesa/src/tnl/t_trans_elt.c Mesa/src/tnl/t_trans_elt.h
Mesa/src/tnl/t_varray.c Mesa/src/tnl/t_varray.h
Mesa/src/tnl/t_vb.c Mesa/src/tnl/t_vb.h
Mesa/src/tnl/t_vbcull.c Mesa/src/tnl/t_vbcull.h
Mesa/src/tnl/t_vbfill.c Mesa/src/tnl/t_vbfill.h
Mesa/src/tnl/t_vbindirect.c Mesa/src/tnl/t_vbindirect.h
Mesa/src/tnl/t_vbrender.c Mesa/src/tnl/t_vbrender.h
Mesa/src/tnl/t_vbxform.c Mesa/src/tnl/t_vbxform.h
Mesa/src/tnl/tnl.h
Added Files:
Mesa/src/mtypes.h
Removed Files:
Mesa/src/types.h
Changed Mesa/src/types to Mesa/src/mtypes.h to avoid conflicts while
compiling on a VMS system.
----------------------------------------------------------------------
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 1e1aac034c986a08248861363c0baa27dc2ae2d5 |
|
13-Nov-2000 |
Keith Whitwell <keith@tungstengraphics.com> |
Cleanup of derived state calculation prior to seperating software T&L
into a new directory. Specifically the handling of changes to lighting
lighting space (light in model vs. light in eye) have been revamped.
Moved several derived values used only by swrast into that directory.
Removed direct calls to swrast_flush() from vbrender.c -- pushed into
ctx->Driver.RenderFinish.
Optimized flat-shading case in swrast_setup.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|
| 7798374e472a8fa2f8699d38873e6b8490d853a4 |
|
06-Nov-2000 |
Brian Paul <brian.paul@tungstengraphics.com> |
New implementation of antialiased lines. Mesa should now pass the remaining
GL conformance tests for AA lines (but not tried yet).
TODO: improve code sharing with the AA triangle code.
/external/mesa3d/src/mesa/swrast/s_aaline.c
|