Commit Graph

2144 Commits

Author SHA1 Message Date
Brian Paul e5923a1240 Merge branch '7.8' 2010-03-08 11:43:20 -07:00
José Fonseca b999e9c03d progs/gallium/unit: Remove the test cases. 2010-03-06 14:36:51 +00:00
José Fonseca 6718f03258 progs/gallium/unit: Skip test cases which cannot be represented in 4ub. 2010-03-06 12:47:49 +00:00
José Fonseca 709dffcd12 progs/gallium/unit: Use the shortened name to reconstruct the function being tested. 2010-03-06 12:47:01 +00:00
José Fonseca f133861a93 progs/gallium/unit: Cleanup/fix PIPE_FORMAT_R8SG8SB8UX8U_NORM test cases. 2010-03-06 12:45:36 +00:00
Vinson Lee ba8f4c5d36 progs/demos: Add arbocclude2 to Makefile and .gitignore. 2010-03-05 23:18:01 -08:00
Jesse Barnes f846a008e9 progs/xdemos: fix up GLX extension checking
A few of my programs were using the client string in addition to the
main extensions string to see if a feature was present.  Correct this to
only check for the currently available and working extensions.
2010-03-05 11:22:05 -08:00
Jesse Barnes 77bc721a52 xdemos/omlsync: add waitformsc and swap interval code 2010-03-05 11:22:04 -08:00
Michal Krol 2b15f4fc68 progs: Add arbocclude2 demo. 2010-03-05 18:42:42 +01:00
Jesse Barnes b6456dc234 xdemos: add OML sync test
Add program to test glXSwapBuffersMscOML behavior.  Based on glsync.c.
2010-03-04 13:14:59 -08:00
George Sapountzis aae81a7681 fix getprocaddress test 2010-03-04 16:34:01 +02:00
José Fonseca be1b7d1a04 progs/gallium/unit: Test (un)pack_4ub.
Most of them are failing.
2010-03-03 13:47:42 +00:00
José Fonseca c2ba284386 progs/gallium/unit: Remove PIPE_FORMAT_R8G8B8X8_SNORM test cases. 2010-03-03 13:07:43 +00:00
José Fonseca 8598cebf43 progs/gallium/unit: Add test cases for single precision floats. 2010-03-02 12:47:16 +00:00
José Fonseca 77d9e93901 progs/gallium/unit: Add test cases for Nx16 and Nx32 integer formats. 2010-03-02 12:40:09 +00:00
José Fonseca 915bbc8b0b progs/gallium/unit: Add more test cases. 2010-03-02 11:30:46 +00:00
José Fonseca 4e1aa4a812 progs/gallium/python: Rename pipe formats. 2010-03-02 10:22:35 +00:00
José Fonseca 3b67f87970 gallium/unit: Rename pipe formats. 2010-03-02 10:22:35 +00:00
José Fonseca 496aa4793a rbug: Rename pipe formats. 2010-03-02 10:21:55 +00:00
José Fonseca b152abe914 progs/gallium/unit: Rename PIPE_FORMAT_A8B8G8R8_SNORM. 2010-03-01 18:47:36 +00:00
José Fonseca c05c675de6 progs/gallium: Make a phony target "unit" to run unit tests. 2010-03-01 13:08:06 +00:00
José Fonseca 5b3c0c151b progs/gallium: Add unit tests for pixel format packing/unpacking. 2010-02-27 20:29:14 +00:00
Kristian Høgsberg 69a0f375cc eglinfo: Wrap extension string 2010-02-26 15:11:29 -05:00
Kristian Høgsberg a509b8cc24 xeglgears: Add an case that exercises EGL_KHR_gl_renderbuffer_image 2010-02-26 14:52:14 -05:00
Brian Paul b056e15662 progs/tests: add compile-time option for coloring texture corners
When debugging wrap modes it's helpful to set each corner of the texture
image to a distinct color.
2010-02-26 12:32:04 -07:00
Dan Nicholson 3a650ba3a2 progs/glsl: Ensure CFLAGS are passed during linking
Commit ab6825b3e3 fixed an issue where the
architecture option -m32 wasn't being passed to the compiler when
linking .o files. This would only fix the issue with user's building
with the hacky --enable-32-bit. The right way to fix this is to pass
CFLAGS to the linker, which the GNU make builtin rules unfortunately
don't do.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Török Edwin <edwintorok@gmail.com>
2010-02-26 11:05:54 -08:00
Kristian Høgsberg 88c174d182 xeglgears: Clean up the code a bit
Still a mess...
2010-02-26 13:18:47 -05:00
Brian Paul 68205bf5b4 progs/xdemos: fix typo in glxinfo help 2010-02-26 08:17:37 -07:00
Michel Dänzer 0c20b30333 Fix up more stale references to gl(X)_API.xml which have moved.
AFAICT the getproc* stanzas in progs/{fp,trivial}/Makefile are completely
unused at this point, so just remove them.
2010-02-26 10:48:07 +01:00
Wil Reichert 2da7f1af38 fix test progs from gl_API move
Looks like these got missed.
2010-02-26 10:48:06 +01:00
George Sapountzis 9a4a219d20 drop header files and demos for dropped window systems 2010-02-26 04:02:41 +02:00
Török Edvin ab6825b3e3 progs/glsl: add ARCH_FLAGS to LDLIBS
Allows building 32-bit demos on 64-bit Debian host.

Signed-off-by: Brian Paul <brianp@vmware.com>
2010-02-25 18:58:55 -07:00
Kristian Høgsberg 74377c8d1b Remove windml progs 2010-02-25 17:40:11 -05:00
Kristian Høgsberg a9e3669683 Remove remaining miniglx references 2010-02-25 17:40:11 -05:00
Kristian Høgsberg 230d263aca Remove GGI support 2010-02-25 17:40:10 -05:00
Kristian Høgsberg 4387580e50 Remove directfb support 2010-02-25 17:40:09 -05:00
Kristian Høgsberg b7041db8f8 xeglgears: Update help text 2010-02-24 20:08:54 -05:00
Kristian Høgsberg f272a780af xeglgears: Remove borrowed GL_OES_EGL_image types
These are now in gl.h.
2010-02-24 14:36:56 -05:00
Kristian Høgsberg 61cc18a866 xeglgears: Add test case for texturing from an EGLImage 2010-02-24 14:28:42 -05:00
José Fonseca e9ac0fbe9b python/retrace: Dump all vertices for verbosity level 3. 2010-02-22 21:46:12 +00:00
Brian Paul 52cc3b03c3 glxinfo: Fix User error in glGetProgramivARB
glxinfo needed fixing after commit 4bccd69.

Move fragment program only parameters into their own list
so that they are not queried for a vertex program.

Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>

(cherry picked from commit b0e5dcb859692707fec8752dd21fc61fc4c3dbcc)
2010-02-22 08:56:18 -07:00
Ray Kohler 701ac58a0c Link egl progs to libm as necessary.
Signed-off-by: Ray Kohler <ataraxia937@gmail.com>
2010-02-22 01:26:12 +08:00
Vinson Lee 6cfdb61f73 progs/redbook: Silence warn_unused_result warnings. 2010-02-20 01:34:16 -08:00
Brian Paul 3ef51b4bd9 progs/tests: new zbitmap.c test to exercize Z testing of glBitmap 2010-02-19 11:12:20 -07:00
Brian Paul e9df31fac9 progs/demos: sort filenames 2010-02-19 11:09:05 -07:00
Brian Paul 86bf224cac progs/demos: update arbocclude.c to do multiple queries at once
Issue a whole bunch of queries then get the results and render.
Draw the test object in red instead of orange if the result was not
ready when we first queried it.
2010-02-18 16:58:38 -07:00
Vinson Lee 82e5a11077 progs/trivial: Update .gitignore. 2010-02-18 01:24:20 -08:00
Vinson Lee 7f7b7b9a02 progs/redbook: Fix array out-of-bounds access. 2010-02-18 01:17:26 -08:00
Vinson Lee 64d18b819b progs/rbug: Silence printf format warning. 2010-02-17 23:22:51 -08:00
Vinson Lee 869896f162 progs/rbug: Add missing headers. 2010-02-17 23:19:24 -08:00
Vinson Lee 8266f1e5a5 progs/rbug: Use util_format_name(). 2010-02-17 22:55:16 -08:00
Vinson Lee 20a11722a2 progs/rbug: Add missing header. 2010-02-17 22:10:04 -08:00
Vinson Lee 56b7a6f632 progs/rbug: s/read/rbug_read/
read conflicts with read in /usr/include/unistd.h.
2010-02-17 21:50:38 -08:00
Ian Romanick 7ccbeb41ac Merge commit '381d5e209815235911c4aab516037c868c8f695f'
This merges the patches from the series "[PATCH 00/14] More
client-side GLX house cleaning" that were posted to the mesa3d-dev
mailing list.  See
http://marc.info/?l=mesa3d-dev&m=126582985214612&w=2

Patches 01 through 04 eliminate a bunch of annoying warnings that I
get when building Mesa.

Patch 05 fixes an inconsistency between the implementation of
glXSwapIntervalMESA and the spec.  I chose to favor the code over the
spec in this case.  This also eliminated a warning.

Patches 06 through 12 clean up the way that context creation is
performed on the client.  When support for GLX_SGIX_fbconfig and the
related GLX 1.3 functions was added, I refactored a bunch
nuts-and-bolts of context creation to CreateContext.  The refactor was
a good idea, I just didn't do it right.

Patches 13 and 14 update glxgears_fbconfig to use GLX 1.3 interfaces.
2010-02-17 11:40:38 -08:00
Brian Paul 0583c29313 progs/demos: update GL version test to accept GL 3.x 2010-02-17 09:02:33 -07:00
Roland Scheidegger 464a72dd41 gallium: remove redundant nr_components field from pipe_vertex_element
This is a property of the associated src_format pipe format.
Hence use util_format_get_nr_components to query this when necessary instead.
2010-02-17 16:44:38 +01:00
Chia-I Wu f4542477cf progs/openvg: Add .gitignore.
Add all OpenVG demos to .gitignore.
2010-02-17 22:32:10 +08:00
Chia-I Wu 915d60dcf5 progs/es1: Update .gitignore.
Add xegl/bindtex to .gitignore.
2010-02-17 22:32:10 +08:00
Vinson Lee 7eaf33ad03 progs/redbook: Fix memory leaks on error paths. 2010-02-17 01:57:14 -08:00
José Fonseca b0f9717105 Revert "progs/redbook: Temporarily disable the demos that extensions not part of windows to fix build."
This reverts commit 1587eff1b6.
2010-02-16 11:23:18 +00:00
Brian Paul c6e63f3cc2 progs/redbook: use glew 2010-02-15 18:04:39 -07:00
José Fonseca 1587eff1b6 progs/redbook: Temporarily disable the demos that extensions not part of windows to fix build. 2010-02-15 21:47:20 +00:00
Brian Paul b90f265fbf progs/redbook: test image for new redbook tests 2010-02-15 09:55:44 -07:00
Brian Paul ce65a8debe progs/redbook: add additional tests for GL 1.4 2010-02-15 09:55:01 -07:00
José Fonseca 21fe86b036 python/retrace: Reconstruct blend state from binary blobs. 2010-02-15 00:25:43 +00:00
Brian Paul 291bd19a1a progs/objviewer: close file (bug 26559) 2010-02-14 10:05:42 -07:00
Brian Paul e84eec0003 progs/fp: close file (bug 26559) 2010-02-14 10:05:42 -07:00
José Fonseca 4ab3f0edef python/retrace: Interpret pipe_screen::context_create(). 2010-02-14 12:48:11 +00:00
José Fonseca 50812e633f progs/gallium/python: New home for python statetracker scripts. 2010-02-14 11:16:41 +00:00
Vinson Lee af1052e280 progs/tests: Add checks for GL_NV_vertex_program. 2010-02-12 11:59:37 -08:00
Ian Romanick 381d5e2098 glxgears_fbconfig: Use glXCreateWindow and glXDestroyWindow 2010-02-11 15:40:29 -08:00
Ian Romanick 6518f6037c glxgears_fbconfig: Use GLX 1.3 name for function poiner types 2010-02-11 15:40:29 -08:00
Kristian Høgsberg 368bb3dc2b eglinfo: Also print visual type, assuming X visual types
This may not make a lot of sense for non-X EGL, but for EGL under X
it's very useful.
2010-02-09 21:24:14 -05:00
Kristian Høgsberg ab487f7ffa xeglgears: Add test case for eglBindTexImage() 2010-02-09 15:55:25 -05:00
Brian Paul fd6701029b progs/tests: add line drawing option to cylwrap.c 2010-02-09 15:33:03 +01:00
Brian Paul 22a3a817aa progs/tests: add x/y rotation to cylwrap.c 2010-02-09 15:33:00 +01:00
Brian Paul 86921aaf3f progs/tests: new test program for exercising cylindrical tex wrap mode 2010-02-09 15:32:47 +01:00
Vinson Lee ad93f3e489 progs/xdemos: Silence uninitialized variable warning. 2010-02-09 01:35:14 -08:00
Joakim Sindholt e891a9cc3a progs/demos: update .gitignore 2010-02-08 12:33:02 +01:00
Vinson Lee 7da1a528b8 progs/xdemos: Silence uninitialized variable warning. 2010-02-08 01:53:31 -08:00
Brian Paul 45ceabf794 progs/demos: fix typo 2010-02-05 13:16:39 -07:00
José Fonseca a1af8eec66 Merge remote branch 'origin/lp-binning'
Conflicts:
	src/gallium/auxiliary/util/u_dl.c
	src/gallium/auxiliary/util/u_time.h
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_surface.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.c
	src/gallium/drivers/llvmpipe/lp_tile_cache.c
2010-02-05 13:48:35 +00:00
José Fonseca ef67ad05cb scons: Use only the shared object name when linking progs.
Otherwise the whole path gets baked into the executable.
2010-02-04 09:23:30 +00:00
Keith Whitwell 9f1ee5a864 progs/fpglsl: couple more tests 2010-02-03 10:36:55 +00:00
Keith Whitwell d7b1610ced progs/fpglsl: fp-tris for glsl 2010-02-03 10:36:55 +00:00
Chia-I Wu 5fa4ea2934 progs/es2: Fix an assertion failure in tri.
EGL_SURFACE_TYPE is a config attribute, not a surface attribute.  Thanks
to Mike Stroyan for pointing out this error.
2010-02-02 10:45:00 +08:00
Brian Paul 04b14e26a2 progs/tests: add another FBO test to exercise a RGBA vs. Z texture bug
See comments in file for more details.
2010-02-01 19:02:52 -07:00
José Fonseca bee9964b29 Merge remote branch 'origin/master' into lp-binning
Conflicts:
	Makefile
	src/gallium/auxiliary/util/u_surface.c
	src/gallium/drivers/llvmpipe/lp_flush.c
	src/gallium/drivers/llvmpipe/lp_setup.c
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_fs.c
	src/gallium/drivers/llvmpipe/lp_state_surface.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.c
	src/gallium/drivers/llvmpipe/lp_texture.c
	src/gallium/drivers/llvmpipe/lp_tile_cache.c
	src/mesa/state_tracker/st_cb_condrender.c
2010-01-31 05:36:33 +00:00
Chia-I Wu 89e6eb5fbe progs/egl: Update eglinfo to display more attributes.
Add config caveat, bind-to-texture, and renderable type.  Remove double
buffer and stereo attributes.
2010-01-31 11:20:15 +08:00
Chia-I Wu 7056a74734 progs/es1: Add bindtex.
It is ported from progs/egl/xeglbindtex.c.  With the OpenGL ES port, the
OpenGL version is removed.
2010-01-30 23:16:17 +08:00
Brian Paul b8d4cbd7e2 progs/demos: new image dissolve demo
Dissolve between two images using a random pattern in the stencil
buffer and a varying stencil ref value.
2010-01-29 14:01:34 -07:00
Brian Paul e94021660b progs/tests: added a few more files to .gitignore 2010-01-29 08:43:28 -07:00
Vinson Lee d40070029f progs/tests: Remove unnecessary headers. 2010-01-28 15:11:39 -08:00
Vinson Lee bbb41153c2 progs/glsl: Fix bump GLSL compilation error on Mac OS. 2010-01-28 14:58:24 -08:00
Vinson Lee 77b1f2fbcf progs/glsl: Remove unused variable in bump.c. 2010-01-28 14:54:10 -08:00
Vinson Lee 07fb52bcf6 progs/glsl: Remove unnecessary header from samplers.c. 2010-01-28 14:22:15 -08:00
Alan Hourihane dea98eb792 support an 'embedded' platform target which turns off most parts of the
build.
2010-01-26 20:59:12 +00:00
Aaron Plattner cec0e7c086 glxgears: Support GLX_EXT_swap_control for querying the current swap interval.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
2010-01-26 12:00:51 -07:00
Brian Paul 782f66c8a2 progs/tests: use glDrawRangeElements() in bufferobj.c 2010-01-26 10:48:00 -07:00
Brian Paul 9b22427911 Merge branch 'mesa_7_7_branch'
Conflicts:

	src/mesa/drivers/dri/intel/intel_screen.c
	src/mesa/drivers/dri/intel/intel_swapbuffers.c
	src/mesa/drivers/dri/r300/r300_emit.c
	src/mesa/drivers/dri/r300/r300_ioctl.c
	src/mesa/drivers/dri/r300/r300_tex.c
	src/mesa/drivers/dri/r300/r300_texstate.c
2010-01-25 14:46:17 -07:00
Vinson Lee 7f2f42dd80 progs/demos: Remove unnecessary header from shadowtex.c. 2010-01-23 20:56:49 -08:00
Dave Airlie 782b6885c2 Merge branch 'arb_half_float_vertex' 2010-01-23 12:29:33 +10:00
Chia-I Wu 0928418922 Revert "add segl"
This reverts commit fe33b7083b.  It was
not supposed to be pushed yet.
2010-01-23 10:33:03 +08:00
Dave Airlie dcaf6687e8 progs: add trivial ARB_half_float_vertex support.
This is just a trivial port of vp-array.c

Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-01-23 12:28:28 +10:00
Chia-I Wu fe33b7083b add segl 2010-01-23 10:10:47 +08:00
Brian Paul cd8614b028 Merge branch 'mesa_7_7_branch'
Conflicts:
	src/gallium/auxiliary/draw/draw_context.c
	src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
	src/gallium/auxiliary/pipebuffer/Makefile
	src/gallium/auxiliary/pipebuffer/SConscript
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
	src/gallium/auxiliary/tgsi/tgsi_scan.c
	src/gallium/drivers/i915/i915_surface.c
	src/gallium/drivers/i915/i915_texture.c
	src/gallium/drivers/llvmpipe/lp_setup.c
	src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
	src/gallium/drivers/llvmpipe/lp_texture.c
	src/gallium/drivers/softpipe/sp_prim_vbuf.c
	src/gallium/state_trackers/xorg/xorg_dri2.c
	src/gallium/winsys/drm/intel/gem/intel_drm_api.c
	src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
	src/gallium/winsys/drm/radeon/core/radeon_drm.c
	src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c
	src/mesa/state_tracker/st_cb_clear.c
2010-01-22 12:17:02 -07:00
Brian Paul 2f1a49e335 progs/xdemos: add z/Z keys for scaling the rendering 2010-01-22 08:08:45 -07:00
Vinson Lee 8bc3c06d86 progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c. 2010-01-21 23:24:40 -08:00
Brian Paul e5829ccc2b progs/demos: call glutDestroyWindow() upon exit 2010-01-21 15:41:03 -07:00
Brian Paul 1ca2285511 progs/fp: testcases for GL_ARB_fragment_coord_conventions
Based on a patch from Luca Barbieri but moved the comments after
the !!ARBfp1.0 header
2010-01-21 09:38:50 -07:00
Chia-I Wu 5e8240320a Merge remote branch 'origin/opengl-es-v2' 2010-01-20 10:02:15 +08:00
Marcin Slusarz 23ae318200 glxgears: unbind current context before "destroying" it
glXDestroyContext does not destroy the context if it's still
connected to some window. Unbind context from window to test it.

Signed-off-by: Brian Paul <brianp@vmware.com>
2010-01-18 10:44:53 -07:00
Chia-I Wu 8311a49b2d progs/egl: Pass EGLDisplay to eglCopyBuffers.
X Display was wrongly passed to eglCopyBuffers.
2010-01-18 17:07:19 +08:00
José Fonseca ba5d600c90 Merge remote branch 'origin/master' into lp-binning
Conflicts:
	src/gallium/drivers/llvmpipe/lp_quad.h
	src/gallium/drivers/llvmpipe/lp_setup.c
2010-01-16 23:21:06 +00:00
Brian Paul 8b29d39e99 progs/trival: updated tri-scissor-tri.c test
The scissor left/right/bottom/top bounds can be moved by pressing
the l/r/b/t and L/R/B/T keys.
2010-01-14 19:22:38 -07:00
Jakob Bornecrantz b01ffb12ed Merge branch 'mesa_7_7_branch'
Conflicts:
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
	src/gallium/auxiliary/util/Makefile
	src/gallium/drivers/r300/r300_state_derived.c
2010-01-14 22:31:04 +00:00
Brian Paul 7fcfb71931 progs/trivial: test user clip plane in tri-point-line-clipped.c 2010-01-14 09:38:47 -07:00
Brian Paul 0a82692154 progs/trivial: test glPolygonMode(POINT/LINE) with frustum clipping
Note whether the new verts introduced by clipping show up as points
and lines along the edge of the window...
2010-01-14 09:22:30 -07:00
Vinson Lee 8e9ceb8309 progs/xdemos: Remove unnecessary header from corender.c. 2010-01-11 20:24:57 -08:00
Vinson Lee 477d51537f progs/trivial: Remove unnecessary headers from tri-fbo-tex.c. 2010-01-11 20:21:50 -08:00
Vinson Lee 7241f5140f progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c. 2010-01-11 20:15:59 -08:00
Vinson Lee ae8ed89f24 progs/tests: Remove duplicate included header in vparray.c. 2010-01-11 19:58:08 -08:00
Vinson Lee 6ed607cce6 progs/tests: Add newline to end of printf in vparray.c. 2010-01-11 19:56:04 -08:00
Vinson Lee 7bfa54c6a4 progs/redbook: Remove unnecessary header from aapoly.c. 2010-01-11 19:52:22 -08:00
Vinson Lee 2178abfba3 progs/glsl: Remove duplicate included header from shtest.c. 2010-01-11 19:42:55 -08:00
Vinson Lee 78ddce9fda progs/demos: Remove unnecessary header from morph3d.c. 2010-01-11 19:29:26 -08:00
Chia-I Wu 76e726515a progs/es2: Correctly set renderable type and client version.
Correctly set EGL_RENDERABLE_TYPE and EGL_CONTEXT_CLIENT_VERSION for
OpenGL ES 2.0.  Because es2_info is copied from es1_info, the fix for it
actually goes to es1_info.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 11:25:09 +08:00
Chia-I Wu 43f67b61fd progs/es1: Bind texture image after rendering.
Unlike FBO, eglBindTexImage is supposed to be called after rendering.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 11:25:09 +08:00
Chia-I Wu 562c127693 Merge branch 'master' into opengl-es-v2
Conflicts:
	src/mesa/main/dd.h
2010-01-12 11:25:02 +08:00
Vinson Lee f07e87ffba progs/tests: Silence fprintf format warning. 2010-01-11 19:16:36 -08:00
Vinson Lee b4bc208529 progs/demos: Remove unnecessary header from isosurf.c. 2010-01-11 19:03:18 -08:00
Chia-I Wu 472a601966 progs/egl: Fix screen surface demos.
Set the screen surface size to the mode size, as the spec requires the
screen surface size to be larger than the mode size.  Besides, bind the
API to OpenGL as they are written in it.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 10:55:35 +08:00
Chia-I Wu c657c80180 progs/egl: glGenTextures is called too early in xeglbindtex.
It should be called after eglMakeCurrent.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 10:55:35 +08:00
Chia-I Wu 3bcb08f6c4 progs: Check the number of configs returned by eglChooseConfig.
A successful eglChooseConfig call does not imply there are valid
configs.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 10:55:35 +08:00
Chia-I Wu 033bd95802 progs: Add missing EGL_RENDERABLE_TYPE for EGL demos.
The default value of EGL_RENDERABLE_TYPE is EGL_OPENGL_ES_BIT.  The
proper values should be specified if we are not using OpenGL ES.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 10:55:35 +08:00
Jesse Barnes c6ef705e41 Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa
Conflicts due to DRI1 removal:
	src/mesa/drivers/dri/intel/intel_context.c
	src/mesa/drivers/dri/intel/intel_screen.c
2010-01-11 15:23:29 -05:00
Jesse Barnes c642f3941b xdemos/glsync: handle no sync method better
Print out count, finish rendering, etc.  Makes the -sn option more useful.
2010-01-08 12:37:44 -05:00
Jesse Barnes 0269dc19b5 xdemos/glsync: check glXMakeCurrent return value
Since this program is used for testing, catching this case can be helpful.
2010-01-08 12:37:43 -05:00
Jesse Barnes f860aac0d8 xdemos/glsync: Make glsync test draw a rectangle
Doing simple buffer clears isn't enough to actually allocate render buffers, we
need to do real drawing.
2010-01-08 12:37:43 -05:00
Jesse Barnes f35f666f81 xdemos/glsync: Add swap interval support to glsync test 2010-01-08 12:37:43 -05:00
Jesse Barnes daf7fe69f7 DRI2: add OML_sync_control support
Add OML_sync_control support, along with a simple program for testing
it.  This means adding support for the DRI2GetMSC, DRI2WaitMSC and
DRI2WaitSBC requests.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2010-01-08 12:31:10 -05:00
José Fonseca 080c40ab32 Merge remote branch 'origin/master' into lp-binning
Conflicts:
	src/gallium/auxiliary/util/u_surface.c
	src/gallium/drivers/llvmpipe/Makefile
	src/gallium/drivers/llvmpipe/SConscript
	src/gallium/drivers/llvmpipe/lp_bld_arit.c
	src/gallium/drivers/llvmpipe/lp_bld_flow.c
	src/gallium/drivers/llvmpipe/lp_bld_interp.c
	src/gallium/drivers/llvmpipe/lp_clear.c
	src/gallium/drivers/llvmpipe/lp_context.c
	src/gallium/drivers/llvmpipe/lp_context.h
	src/gallium/drivers/llvmpipe/lp_draw_arrays.c
	src/gallium/drivers/llvmpipe/lp_jit.c
	src/gallium/drivers/llvmpipe/lp_jit.h
	src/gallium/drivers/llvmpipe/lp_prim_vbuf.c
	src/gallium/drivers/llvmpipe/lp_setup.c
	src/gallium/drivers/llvmpipe/lp_setup_point.c
	src/gallium/drivers/llvmpipe/lp_state.h
	src/gallium/drivers/llvmpipe/lp_state_blend.c
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_fs.c
	src/gallium/drivers/llvmpipe/lp_state_sampler.c
	src/gallium/drivers/llvmpipe/lp_state_surface.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.h
	src/gallium/drivers/llvmpipe/lp_tex_sample.h
	src/gallium/drivers/llvmpipe/lp_tile_cache.c
2010-01-08 15:42:57 +00:00
Brian Paul fd70841121 Merge branch 'mesa_7_7_branch'
Conflicts:

	src/mesa/drivers/dri/i965/brw_wm_emit.c
2010-01-08 08:21:12 -07:00
Brian Paul 7c55fe9bfd progs/fp: increase buffer size to read larger shaders 2010-01-07 09:20:48 -07:00
Brian Paul 2b7a4b2c0e progs/fp: remove invalid tri-inv.c test
INV is not a valid instruction.
2010-01-07 08:22:39 -07:00
Vinson Lee d42467687e progs/demos: Assert that input to malloc is valid. 2010-01-06 21:39:44 -08:00
Vinson Lee 6d6c9c6688 progs/demos: Remove unnecessary header from fbotexture.c. 2010-01-11 00:24:39 -08:00
Vinson Lee 199dedd6dd progs/demos: Check upper bounds of input in manywin.c. 2010-01-10 01:57:13 -08:00
Vinson Lee 0c7814fe23 progs/demos: Bounds check input to fire.c. 2010-01-10 00:40:46 -08:00
Vinson Lee 683e3cb8db progs/tests: Silence 'missing initializer' warnings. 2010-01-08 23:08:57 -08:00
Vinson Lee 223c8482ca progs/glsl: Silence uninitialized variable warning. 2010-01-08 22:10:52 -08:00
Vinson Lee 3b82de92a0 progs/demos: Add missing initializers in engine.c. 2010-01-08 22:02:49 -08:00
Vinson Lee 45ac10fe6a progs/xdemos: Check for string overflow. 2010-01-06 18:19:46 -08:00
Vinson Lee 25ffd76278 progs/xdemos: Check for string overflow. 2010-01-06 18:08:41 -08:00
Vinson Lee 4c45810d57 progs/xdemos: Remove comma at end of enumerator list. 2010-01-06 15:35:18 -08:00
Vinson Lee 96a4e4552d progs/xdemos: Use temporary variables.
This was missed from the previous commit to glxheads.c.
2010-01-06 15:33:13 -08:00
Vinson Lee c1dad22d71 progs/glsl: Prevent possible string overflow. 2010-01-06 15:25:42 -08:00
Vinson Lee f4952f040b progs/xdemos: Prevent possible string overflow. 2010-01-06 14:56:43 -08:00
Brian Paul 5ac16495a2 Merge branch 'mesa_7_7_branch'
Conflicts:
	docs/relnotes.html
	src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
	src/gallium/drivers/r300/r300_cs.h
	src/mesa/drivers/dri/i965/brw_wm_surface_state.c
	src/mesa/main/enums.c
2010-01-04 19:16:24 -07:00
Chia-I Wu 8e6774937f progs/es1: Add compressed paletted texture tests to torus.
The tests can be toggled by `t'.  It will print current texture format
and the size of the image.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:16 -07:00
Vinson Lee 8a29e3f8e8 progs/egl: Silence uninitialized variable warnings. 2010-01-03 21:39:20 -08:00
Vinson Lee 3ea5a95078 progs/samples: Silence compiler warnings. 2010-01-03 21:29:33 -08:00
Vinson Lee 1da47ac20e progs/vp: Ensure null-terminated byte string. 2010-01-03 02:38:22 -08:00
Vinson Lee c9c6e9a39e progs/tests: Silence uninitialized variable warning. 2010-01-02 21:58:40 -08:00
Vinson Lee 32d18924df progs/tests: Silence warn_unused_result warning. 2010-01-02 21:52:51 -08:00
Vinson Lee 646c8ce032 progs/samples: 'Silence no previous prototype' warnings. 2010-01-01 17:54:11 -08:00
Vinson Lee ad9defdd9c progs/rbug: s/wait/rbug_wait/
wait conflicts with wait in /usr/include/sys/wait.h.
2010-01-01 16:25:37 -08:00
José Fonseca 7bbf7f94ea scons: Build progs together with everything else.
This is a substantial reorganization, This particular commit enables:
- building the progs for unices platforms
- glew is now built as a shared library (it is the default, and it is
inconvenient and pointless to shift away from that default)
- all progs get built by default
2010-01-01 12:16:19 +00:00
José Fonseca 58b401315b progs: Ignore derived files. 2010-01-01 12:16:19 +00:00
Brian Paul 25024d9482 Merge branch 'mesa_7_7_branch'
Conflicts:
	configs/darwin
	src/gallium/auxiliary/util/u_clear.h
	src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
	src/mesa/drivers/dri/i965/brw_draw_upload.c
2009-12-31 09:02:27 -07:00
Brian Paul 34075d0219 progs/tests: added test for GL_EXT_draw_buffers2
Render into two color buffers (render targets).  Display half of each
buffer in the window.  Use different color masks for each render target.
Only enable blending for the second render target.
2009-12-31 08:49:27 -07:00
Brian Paul 08d145e1d7 progs/tests: added conditional rendering test program 2009-12-31 08:49:27 -07:00
Vinson Lee 5b2713c92a progs/glsl: Provide a better fix for fgets warning. 2009-12-30 12:38:21 -08:00
Vinson Lee 0ab29d2b35 progs/glsl: Silence compiler warnings. 2009-12-29 21:11:37 -08:00
Brian Paul d0b7ff551a Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
	src/gallium/auxiliary/util/u_network.c
	src/gallium/auxiliary/util/u_network.h
	src/gallium/drivers/i915/i915_state.c
	src/gallium/drivers/trace/tr_rbug.c
	src/gallium/state_trackers/vega/bezier.c
	src/gallium/state_trackers/vega/vg_context.c
	src/gallium/state_trackers/xorg/xorg_crtc.c
	src/gallium/state_trackers/xorg/xorg_driver.c
	src/gallium/winsys/xlib/xlib_brw_context.c
	src/mesa/main/mtypes.h
2009-12-27 15:31:08 -07:00
Vinson Lee e81fe088f4 progs/demos: Silence warn_unused_result warnings. 2009-12-26 01:08:26 -08:00
Vinson Lee cdc69e3469 progs/util: Silence warn_unused_result warnings. 2009-12-25 23:13:50 -08:00
Roland Scheidegger faae0e5da3 rbug: rename pf_is_compressed to util_format_is_compressed 2009-12-23 16:57:46 +01:00
Vinson Lee 0f6cbc55b7 progs/tests: Fix build.
(cherry picked from commit 1bf2d78b11)
2009-12-22 23:30:23 -08:00
Keith Whitwell aa02683e45 Merge branch 'i965g-restart'
Conflicts:
	configure.ac
2009-12-22 09:40:39 +00:00
Vinson Lee 1bf2d78b11 progs/tests: Fix build. 2009-12-22 00:54:34 -08:00
Vinson Lee 982acbddab progs/perf: Fix MSVC build.
(cherry picked from commit cbf46ed670)
2009-12-21 18:10:44 -08:00
Brian Paul 9eb7fc6661 Merge branch 'mesa_7_7_branch'
Conflicts:
	src/mesa/main/version.h
	src/mesa/state_tracker/st_atom_shader.c
2009-12-21 18:35:54 -07:00
Brian Paul b57abd3bea Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
	configure.ac
	progs/demos/morph3d.c
	progs/demos/textures.c
	progs/glsl/shtest.c
	progs/glsl/texaaline.c
	progs/tests/packedpixels.c
	progs/xdemos/corender.c
	src/mesa/main/version.h
2009-12-21 18:23:53 -07:00
Vinson Lee 07b54fe35b progs/redbook: Silence compiler warnings. 2009-12-21 15:20:01 -08:00
Brian Paul fdae39c289 progs/perf: added check for GL_ARB_framebuffer_object 2009-12-21 13:49:25 -07:00
Brian Paul 79e74cda73 progs/demos: report pixel rate in million pixels / sec 2009-12-21 13:49:25 -07:00
Brian Paul d26cdaaa23 progs/osmes: add missing libGL dependency, remove unneeded lines 2009-12-21 13:37:11 -07:00
Keith Whitwell 66e779c22b i965g: back out unintentional changes to gears 2009-12-21 19:19:01 +00:00
Keith Whitwell a5585cb533 Merge commit 'origin/master' into i965g-restart
Conflicts:
	SConstruct
	configs/default
	configs/linux-dri
2009-12-21 19:18:41 +00:00
Vinson Lee 0dd9513874 progs/tests: Silence compiler warnings. 2009-12-20 01:01:00 -08:00
Vinson Lee d87d71036c progs/trivial: Use C-style comments. 2009-12-19 00:28:01 -08:00
Vinson Lee 3340fd65fb progs/xdemos: Use C-style comment. 2009-12-19 00:00:56 -08:00
Vinson Lee 695adf41e2 progs/demos: Silence compiler warning in morph3d.c. 2009-12-18 23:46:14 -08:00
Vinson Lee 121ff55d81 progs/glsl: Use C-style comments. 2009-12-18 23:38:15 -08:00
Vinson Lee 41377942d3 progs/demos: Use C-style comment. 2009-12-18 23:34:28 -08:00
Brian Paul 263f4322e7 progs/demos: fix glut initialization calls
Remove glutInitWindowPosition() calls to play nicer with window managers.

Move glutInitWindowSize() calls before glutInit() so the the default window
size can be overridden by the -geometry cmd line option.
2009-12-18 13:58:14 -07:00
Michal Krol b1ed72ebe2 Move the remaining format pf_get_* functions to u_format.h.
Previously they depended on format blocks, but after removing those
they started depending on format encoding.
2009-12-17 23:41:57 +01:00
Vinson Lee 0a8d508854 progs/trivial: Silence compiler warnings. 2009-12-14 18:11:57 -08:00
Vinson Lee 588e9f69c4 progs/trivial: Silence compiler warnings in tri-blend-min.c. 2009-12-12 15:47:17 -08:00