Kristian Høgsberg [Thu, 22 Apr 2010 16:40:47 +0000 (12:40 -0400)]
mesa: Move struct _glapi_table allocation out of context.c
We now allocate the table from api_exec.c and dlist.c where we fill out
the table. This way, context.c doesn't need to know the actual contents
of struct _glapi_table.
Kristian Høgsberg [Thu, 22 Apr 2010 15:41:41 +0000 (11:41 -0400)]
mesa: Compute extension string according to API
We can now stop special casing glGetString() and drop specials_es*.c.
Kristian Høgsberg [Thu, 22 Apr 2010 12:27:51 +0000 (08:27 -0400)]
es2: Move over es2 code to compute extensions
Kristian Høgsberg [Thu, 22 Apr 2010 12:34:42 +0000 (08:34 -0400)]
main: Report GL_SHADING_LANGUAGE_VERSION according to API
Kristian Høgsberg [Wed, 21 Apr 2010 20:14:18 +0000 (16:14 -0400)]
mesa: Compute GL version according to API
Kristian Høgsberg [Thu, 22 Apr 2010 15:07:45 +0000 (11:07 -0400)]
mesa: Move API specific context intialization into context.c
Kristian Høgsberg [Thu, 22 Apr 2010 13:32:11 +0000 (09:32 -0400)]
st/mesa: Use API-aware context constructor
The mesa state tracker is currently the only place where we create a
context and expect it to implement GLES1/2. Use the API-aware constructor
to communicate this to core mesa.
Kristian Høgsberg [Thu, 22 Apr 2010 13:25:51 +0000 (09:25 -0400)]
mesa: Track the OpenGL API we're implementing in the context
This introduces a new way to create or initialize a context:
_mesa_create_context_for_api and
_mesa_initialize_context_for_api
which in addition to the current arguments take an api enum to indicate
which OpenGL API the context should implement. At this point the
API field in GLcontext isn't used anywhere, but later commits will
key certain functionality off of it.
The _mesa_create_context and _mesa_initialize_context functions are
kept in place as wrappers around the *_for_api versions, passing in
API_OPENGL to get the same behavior as before.
Vinson Lee [Thu, 22 Apr 2010 07:45:27 +0000 (00:45 -0700)]
gallivm: Remove unused variable.
Alex Deucher [Thu, 22 Apr 2010 06:37:34 +0000 (02:37 -0400)]
r300g: fix vertex unit setup
RV3xx is 2, RV560,RV570 is 8
Noticed by Tormod Volden.
Vinson Lee [Thu, 22 Apr 2010 01:45:44 +0000 (18:45 -0700)]
gallium/util: Fix deviation calculation in u_cache.
The approximate deviation calculation was using the entire cache's total
instead of each cache entry's total.
Vinson Lee [Thu, 22 Apr 2010 01:31:01 +0000 (18:31 -0700)]
gallium/tests: Add test case for u_cache.
Brian Paul [Thu, 22 Apr 2010 00:22:15 +0000 (18:22 -0600)]
gallivm: added some assertions in loop-gen code
We're hitting these assertions with nested loops...
Brian Paul [Wed, 21 Apr 2010 23:58:26 +0000 (17:58 -0600)]
gallivm: fix copy&paste error: s/cont_stack_size/break_stack_size/
Brian Paul [Wed, 21 Apr 2010 23:57:44 +0000 (17:57 -0600)]
gallivm: emit_instruction() is boolean
Brian Paul [Wed, 21 Apr 2010 22:30:04 +0000 (16:30 -0600)]
progs/glsl: better comments
Brian Paul [Wed, 21 Apr 2010 22:29:13 +0000 (16:29 -0600)]
llvmpipe: add missing dependency in Makefile
Brian Paul [Wed, 21 Apr 2010 22:27:23 +0000 (16:27 -0600)]
gallivm: implement TGSI KILP
As in tgsi_exec.c we don't actually rely on condition codes; we do
an unconditional kill. The only predication comes from the execution
mask which applies inside loops/conditionals.
José Fonseca [Wed, 21 Apr 2010 16:30:39 +0000 (17:30 +0100)]
draw: Make LLVM integration work without llvmpipe too (e.g. sofptipe).
Prevents the assertion failure.
Marek Olšák [Wed, 21 Apr 2010 20:53:11 +0000 (22:53 +0200)]
radeon: fix warning
Marek Olšák [Wed, 21 Apr 2010 20:48:07 +0000 (22:48 +0200)]
r300g: raise the max index for generic varyings to 32
This should fix an assertion failure in the game Heroes of Newearth.
Yes, the game seems to generate semantic indices greater than 15.
Brian Paul [Wed, 21 Apr 2010 20:23:42 +0000 (14:23 -0600)]
softpipe: call draw_wide_point_sprites()
Brian Paul [Wed, 21 Apr 2010 20:24:26 +0000 (14:24 -0600)]
gallium/draw: fix point sprite handling
New draw API function to indicate whether or not to convert points to
quads for sprite rasterization.
Fix point-to-quad conversion regression in the wide-point stage. We
need to check the pipe_rasterizer_state::point_quad_rasterization flag.
Brian Paul [Wed, 21 Apr 2010 20:16:02 +0000 (14:16 -0600)]
gallium/draw: use local var to simplify code
Brian Paul [Wed, 21 Apr 2010 16:30:53 +0000 (10:30 -0600)]
llvmpipe: consolidate texture memory allocation code
And fix incorrect allocation of linear memory for display targets.
This fixes fd.o bugs 27761 and 27762.
Brian Paul [Wed, 21 Apr 2010 15:58:15 +0000 (09:58 -0600)]
st/glx: variable 'i' is an enum
Now we can get see 'i' as an enum name instead of a plain integer in gdb.
Jakob Bornecrantz [Wed, 21 Apr 2010 13:48:54 +0000 (14:48 +0100)]
targets: Don't check if we should use trace
Trace does its own checking, and it used the GALLIUM_TRACE variable
as well, but expected a file and not a bool argument.
José Fonseca [Wed, 21 Apr 2010 09:19:39 +0000 (11:19 +0200)]
mesa/st: Translate a few more mesa/gallium formats.
These endup used by Xvnc.
Vinson Lee [Wed, 21 Apr 2010 05:56:39 +0000 (22:56 -0700)]
llvmpipe: Remove unused variable.
Brian Paul [Wed, 21 Apr 2010 03:17:35 +0000 (21:17 -0600)]
mesa: do version checking for GL 3.x queries
Brian Paul [Wed, 21 Apr 2010 03:02:09 +0000 (21:02 -0600)]
mesa: API and state for GL 3.1 primitive restart
Brian Paul [Wed, 21 Apr 2010 02:52:56 +0000 (20:52 -0600)]
mesa: add GL 3.2 GL_CONTEXT_PROFILE_MASK query
Brian Paul [Wed, 21 Apr 2010 02:44:54 +0000 (20:44 -0600)]
mesa: remove some comments
Zhenyu Wang [Mon, 19 Apr 2010 08:27:10 +0000 (16:27 +0800)]
intel: Add Sandybridge mobile chipset id
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Zhenyu Wang [Mon, 19 Apr 2010 07:51:50 +0000 (15:51 +0800)]
intel: Clean up chipset name and gen num for Ironlake
Rename old IGDNG to Ironlake, and set 'gen' number for
Ironlake as 5, so tracking the features with generation num
instead of special is_ironlake flag.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Vinson Lee [Wed, 21 Apr 2010 01:48:04 +0000 (18:48 -0700)]
gallivm: Remove unnecessary headers.
Vinson Lee [Wed, 21 Apr 2010 00:22:26 +0000 (17:22 -0700)]
i965g: s/inttypes.h/stdint.h/
MSVC doesn't have either but Mesa has stdint.h at include/c99.
Vinson Lee [Wed, 21 Apr 2010 00:02:03 +0000 (17:02 -0700)]
i965g: Remove unnecessary header.
Vinson Lee [Tue, 20 Apr 2010 23:40:55 +0000 (16:40 -0700)]
llvmpipe: Change return type of declaration to match code.
Commit
2142108e0e1cf1ed8d0142e9c41fe1947abe0907 changed the return type
of llvmpipe_get_texture_image_address function but didn't change the
declaration.
Fixes build.
Brian Paul [Tue, 20 Apr 2010 23:28:33 +0000 (17:28 -0600)]
llvmpipe: code consolidation
Brian Paul [Tue, 20 Apr 2010 23:19:30 +0000 (17:19 -0600)]
llvmpipe: remove debug code and simplify
Brian Paul [Tue, 20 Apr 2010 23:14:47 +0000 (17:14 -0600)]
llvmpipe: fix cube face addressing bug
Fixes fd.o bug 27760 (pigit fbo-cubemap).
Brian Paul [Tue, 20 Apr 2010 23:14:21 +0000 (17:14 -0600)]
llvmpipe: whitespace fix
Jakob Bornecrantz [Tue, 20 Apr 2010 22:59:38 +0000 (23:59 +0100)]
gallium: Fix copy typo
Jakob Bornecrantz [Tue, 20 Apr 2010 22:31:39 +0000 (23:31 +0100)]
svga: Minor clean up of winsys
Jakob Bornecrantz [Tue, 20 Apr 2010 22:31:25 +0000 (23:31 +0100)]
radeong: Minor clean up of winsys
Also try to wrap trace around driver on non-debug builds, its free.
Jakob Bornecrantz [Tue, 20 Apr 2010 22:31:07 +0000 (23:31 +0100)]
nouveau: Minor clean up of winsys
Jakob Bornecrantz [Tue, 20 Apr 2010 22:30:41 +0000 (23:30 +0100)]
i965g: Minor clean up of winsys
Jakob Bornecrantz [Tue, 20 Apr 2010 22:28:19 +0000 (23:28 +0100)]
i915g: Minor clean up of winsys
Jakob Bornecrantz [Tue, 20 Apr 2010 22:51:56 +0000 (23:51 +0100)]
st/egl: No need to use drm_api argument struct
Jakob Bornecrantz [Tue, 20 Apr 2010 22:51:22 +0000 (23:51 +0100)]
st/egl: Use correct driver_name field to get kernel driver name
Jakob Bornecrantz [Tue, 20 Apr 2010 22:44:40 +0000 (23:44 +0100)]
st/egl: Check for null destroy callback on api struct
Brian Paul [Tue, 20 Apr 2010 22:15:14 +0000 (16:15 -0600)]
mesa: better, smaller error handling code for glGet*()
get.o is about 17% smaller.
Brian Paul [Tue, 20 Apr 2010 22:13:08 +0000 (16:13 -0600)]
mesa: better, smaller error handling code for glEnable/Disable/IsEnabled()
Use a goto instead of replicating the _mesa_error() call many times.
enable.o is about 15% smaller.
Brian Paul [Tue, 20 Apr 2010 22:12:34 +0000 (16:12 -0600)]
mesa: raise GL_INVALID_OPERATION for glReadPixels(GL_COLOR_INDEX)
We no longer support CI-mode color buffers so this is always an error.
Jakob Bornecrantz [Tue, 20 Apr 2010 21:49:27 +0000 (22:49 +0100)]
targets: Use a valid winsys include path in Makefile.dri
Corbin Simpson [Tue, 20 Apr 2010 20:08:55 +0000 (13:08 -0700)]
r300g: Spill a bit more info about implementation errors in surface_copy.
compiz appears to hit this. Weird.
Christoph Bumiller [Tue, 20 Apr 2010 20:01:37 +0000 (22:01 +0200)]
nv50: make a working check for user memory vertex/index buffers
Christoph Bumiller [Tue, 20 Apr 2010 19:20:55 +0000 (21:20 +0200)]
nv50: fix FP result counting for depth output
Christoph Bumiller [Tue, 20 Apr 2010 19:18:15 +0000 (21:18 +0200)]
nv50: support vertex index bias
Brian Paul [Tue, 20 Apr 2010 19:50:59 +0000 (13:50 -0600)]
llvmpipe: fix depth+stencil logic error
If both Z-test and stencil-test were enabled, we were mis-computing
the vector of updated Z buffer values.
Fixes Z testing bug in progs/demos/fbotexture.c
Brian Paul [Tue, 20 Apr 2010 17:50:50 +0000 (11:50 -0600)]
llvmpipe: fix comment/typo
Eric Anholt [Tue, 20 Apr 2010 19:26:49 +0000 (12:26 -0700)]
i915: Map sampler indices to texture units correctly for fragment shaders.
Fixes hang with "gst-launch-0.10 videotestsrc ! video/x-raw-rgb !
glupload ! gleffects effect=heat ! glimagesink" which uses 2 samplers
pointing at GL_TEXTURE1 and GL_TEXTURE2, and piglit
glsl-fs-sampler-numbering.
Eric Anholt [Mon, 12 Apr 2010 20:19:53 +0000 (13:19 -0700)]
i915: Add missing break; after handling the stub NOISE instructions.
Bug #27348
Brian Paul [Tue, 20 Apr 2010 17:43:58 +0000 (11:43 -0600)]
llvmpipe: fix incorrect front-facing value for fragment shader
The TGSI convention is +1 for front-facing, -1 for back-facing
Fixes glean glsl1 gl_FrontFacing tests.
Brian Paul [Tue, 20 Apr 2010 17:23:53 +0000 (11:23 -0600)]
llvmpipe: rename mode -> interp
Brian Paul [Tue, 20 Apr 2010 16:56:01 +0000 (10:56 -0600)]
llvmpipe: remove dead code/comment
Brian Paul [Tue, 20 Apr 2010 16:10:21 +0000 (10:10 -0600)]
nv50: move declaration before code
Brian Paul [Tue, 20 Apr 2010 16:09:55 +0000 (10:09 -0600)]
nv50: fixed void pointer arithment warning
Brian Paul [Tue, 20 Apr 2010 16:08:52 +0000 (10:08 -0600)]
gallium/util: remove bogus return statement
util_surfaces_do_detach() is a void-valued function.
Brian Paul [Mon, 19 Apr 2010 19:56:21 +0000 (13:56 -0600)]
progs/tests: asst. changes to antialias.c
Brian Paul [Tue, 20 Apr 2010 16:00:03 +0000 (10:00 -0600)]
gallium: replace pipe_resource::_usage with pipe_resource::usage
Brian Paul [Tue, 20 Apr 2010 15:43:45 +0000 (09:43 -0600)]
nv50: add missing idxbias param to nv50_push_elements_instanced()
Brian Paul [Tue, 20 Apr 2010 14:42:30 +0000 (08:42 -0600)]
llvmpipe: remove call to llvmpipe_set_texture_image_layout()
This would seem to be needed but caused some regressions.
More investigation will be done.
José Fonseca [Tue, 20 Apr 2010 14:27:42 +0000 (16:27 +0200)]
llvmpipe: Re-enable half float formats.
They should be working now, both textures and vertex/index/buffers.
This reverts commit
efc69ca61cf8fe7d2d44d177e7737999b6a114b5.
José Fonseca [Tue, 20 Apr 2010 14:21:08 +0000 (16:21 +0200)]
gallivm: Universal format support on lp_build_fetch_rgba_aos via util_format_description::fetch_rgba_float
This therefore adds support to half float vertex buffers.
José Fonseca [Tue, 20 Apr 2010 13:09:02 +0000 (15:09 +0200)]
gallivm: Cleanups and bugfixes to aos format translation.
José Fonseca [Tue, 20 Apr 2010 12:02:05 +0000 (14:02 +0200)]
draw: Fallback to gallivm for translation of A8R8G8B8/B8G8R8A8/R10G10B10X2/R10G10B10X2 and other formats.
These need swizzles, and bitshifts.
José Fonseca [Tue, 20 Apr 2010 11:58:45 +0000 (13:58 +0200)]
gallivm: New function to fetch a pixel into a 4xfloat AoS vector.
José Fonseca [Tue, 20 Apr 2010 11:41:10 +0000 (13:41 +0200)]
gallivm: Bring aos format back to life.
Useful for fetching vertices for formats that are straight arrays.
This reverts commit
aa364d091e7e2ef2296fb25f92efc79a8c88f77d.
José Fonseca [Tue, 20 Apr 2010 11:26:36 +0000 (13:26 +0200)]
nvfx: Fix typo.
José Fonseca [Tue, 20 Apr 2010 11:26:24 +0000 (13:26 +0200)]
draw: Remove draw_vs_llvm.c.
To silence some warnings.
Super-seeded by Zack's new llvm middle end.
Alan Hourihane [Tue, 20 Apr 2010 09:33:56 +0000 (10:33 +0100)]
llvmpipe: silence warning
José Fonseca [Tue, 20 Apr 2010 09:07:08 +0000 (11:07 +0200)]
Merge branch 'gallium-index-bias'
José Fonseca [Tue, 20 Apr 2010 09:06:05 +0000 (11:06 +0200)]
draw: No need to rebase for elt_bias.
As we are rebasing to min_index + elt_bias, and the vertex buffer has no
elt_bias.
I still don't know how to exercise this code. I hope this is now right.
José Fonseca [Tue, 20 Apr 2010 08:32:06 +0000 (10:32 +0200)]
draw: Fix cache elt_bias implementation.
José Fonseca [Tue, 20 Apr 2010 08:22:28 +0000 (10:22 +0200)]
gallium/docs: Make it clear that minIndex, maxIndex is exclusively a index buffer characteristic.
Unlike the indexBias which is specific to a draw call.
This are the semantics of both D3D and GL ARB_draw_elements_base_vertex
extension.
José Fonseca [Tue, 20 Apr 2010 08:19:42 +0000 (10:19 +0200)]
draw: Fix typo resulting from bad regular expression in index bias addition.
Vinson Lee [Tue, 20 Apr 2010 07:00:52 +0000 (00:00 -0700)]
draw llvm: Move dereference of pointer after NULL check.
Vinson Lee [Tue, 20 Apr 2010 06:58:23 +0000 (23:58 -0700)]
draw llvm: Remove unnecessary header.
Dan Nicholson [Tue, 20 Apr 2010 03:25:17 +0000 (20:25 -0700)]
egl: Fix demos to build with user specified Xlib
Commit
88be2171e7 fixed the egl demos on the stable branch, but now
they're spread out across multiple subdirectories.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Dan Nicholson [Tue, 20 Apr 2010 03:22:48 +0000 (20:22 -0700)]
Merge branch '7.8'
Conflicts:
progs/egl/Makefile
progs/egl/Makefile is gone on master with the egl demos split into
subdirectories. Will require an additional commit.
Dan Nicholson [Sun, 18 Apr 2010 16:33:03 +0000 (09:33 -0700)]
egl: Pass flags to locate Xlib headers and libraries
eglplatform.h pulls in Xlib.h on X11 platforms. Likewise, the egl glx
driver and egl programs needs to link to libX11. Make sure we use the
locations the user told us about.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Dan Nicholson [Thu, 1 Apr 2010 21:59:10 +0000 (14:59 -0700)]
progs: Fix linking of Xlib demos for non-autoconf builds
The Xlib demos were fixed to use $(X11_LIBS) so that configure could
detect the proper directory to link the library from, but this broke
the non-autoconf builds. Give X11_LIBS a default value to fallback on.
(cherry picked from commit
e40fce13e152ecf929c899ed38a8e5f7d198c738)
Dan Nicholson [Tue, 16 Mar 2010 03:53:56 +0000 (20:53 -0700)]
Change libX11 variables to not conflict with AC_PATH_XTRA
The variable X_LIBS from AC_PATH_XTRA contains only the -L searchdir
parameter and not the -lX11 to link to Xlib. Use X11 prefixed build vars
for linking with Xlib to avoid the conflict.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
(cherry picked from commit
e725ef171b5a4d5425461f237d9ccab223806913)
Dan Nicholson [Fri, 2 Apr 2010 13:33:48 +0000 (06:33 -0700)]
gallium: Respect user's CFLAGS for including X headers
This can break on systems that don't have a system X installation.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
(cherry picked from commit
de4ee20578a79e024b0de83c40648112f42c994e)
Conflicts:
src/gallium/winsys/xlib/Makefile
Jeff Smith [Sat, 13 Mar 2010 00:55:09 +0000 (18:55 -0600)]
Use X_LIBS from pkg-config, instead of libdir, for locating libX11
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
(cherry picked from commit
8d86d395dcf6a5f192b6987485bb7aef49f1fefc)
Brian Paul [Tue, 20 Apr 2010 02:42:33 +0000 (20:42 -0600)]
glapi: GL 3.x xml file
Some of the entrypoints defined in other .xml files will need to
be removed in favor of these...
Brian Paul [Mon, 19 Apr 2010 23:16:15 +0000 (17:16 -0600)]
llvmpipe: remove dead code
Brian Paul [Mon, 19 Apr 2010 23:15:25 +0000 (17:15 -0600)]
llvmpipe: use llvmpipe_resource_stride()