| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote branch 'origin/opengl-es-v2' | Chia-I Wu | 2010-01-20 | 18 | -0/+5482 |
| |\ | |||||
| | * | progs/es2: Correctly set renderable type and client version. | Chia-I Wu | 2010-01-12 | 3 | -7/+23 |
| | | | | | | | | | | | | | | | | | 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 <[email protected]> | ||||
| | * | progs/es1: Bind texture image after rendering. | Chia-I Wu | 2010-01-12 | 1 | -3/+5 |
| | | | | | | | | | | | | | Unlike FBO, eglBindTexImage is supposed to be called after rendering. Signed-off-by: Chia-I Wu <[email protected]> | ||||
| | * | Merge branch 'master' into opengl-es-v2 | Chia-I Wu | 2010-01-12 | 342 | -1268/+2401 |
| | |\ | | | | | | | | | | | | | Conflicts: src/mesa/main/dd.h | ||||
| | * | | progs/es1: Add compressed paletted texture tests to torus. | Chia-I Wu | 2010-01-04 | 1 | -2/+149 |
| | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> | ||||
| | * | | progs/es1: Port eglgears to OpenGL ES 1.1. | Chia-I Wu | 2009-11-10 | 3 | -0/+379 |
| | | | | | | | | | | | | | | | | | | | This demo requires EGL_MESA_screen_surface to run. Signed-off-by: Chia-I Wu <[email protected]> | ||||
| | * | | progs/es1: Port egltri to OpenGL ES 1.1. | Chia-I Wu | 2009-11-10 | 5 | -0/+466 |
| | | | | | | | | | | | | | | | | | | | This demo requires EGL_MESA_screen_surface to run. Signed-off-by: Chia-I Wu <[email protected]> | ||||
| | * | | progs/es: Add .gitignore. | Chia-I Wu | 2009-11-10 | 2 | -0/+11 |
| | | | | | | | | | | | | | Signed-off-by: Chia-I Wu <[email protected]> | ||||
| | * | | progs/es: OpenGL ES 1.x and 2.X demo programs. | Chia-I Wu | 2009-11-05 | 11 | -0/+4461 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The demo programs are written by Brian Paul, and cherry-picked from opengl-es branch. Several minor issues such as a linking problem are fixed. Signed-off-by: Chia-I Wu <[email protected]> | ||||
| * | | | progs/egl: Pass EGLDisplay to eglCopyBuffers. | Chia-I Wu | 2010-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | X Display was wrongly passed to eglCopyBuffers. | ||||
| * | | | Merge branch 'mesa_7_7_branch' | Jakob Bornecrantz | 2010-01-14 | 16 | -20/+30 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c | ||||
| | * | | | progs/xdemos: Remove unnecessary header from corender.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | progs/trivial: Remove unnecessary headers from tri-fbo-tex.c. | Vinson Lee | 2010-01-11 | 1 | -2/+0 |
| | | | | | |||||
| | * | | | progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | progs/tests: Remove duplicate included header in vparray.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | progs/tests: Add newline to end of printf in vparray.c. | Vinson Lee | 2010-01-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | progs/redbook: Remove unnecessary header from aapoly.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | progs/glsl: Remove duplicate included header from shtest.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | progs/demos: Remove unnecessary header from morph3d.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | progs/tests: Silence fprintf format warning. | Vinson Lee | 2010-01-11 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | progs/demos: Remove unnecessary header from isosurf.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | progs/demos: Remove unnecessary header from fbotexture.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | progs/demos: Check upper bounds of input in manywin.c. | Vinson Lee | 2010-01-10 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | progs/demos: Bounds check input to fire.c. | Vinson Lee | 2010-01-10 | 1 | -1/+7 |
| | | | | | |||||
| | * | | | progs/tests: Silence 'missing initializer' warnings. | Vinson Lee | 2010-01-08 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | progs/glsl: Silence uninitialized variable warning. | Vinson Lee | 2010-01-08 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | progs/demos: Add missing initializers in engine.c. | Vinson Lee | 2010-01-08 | 1 | -3/+15 |
| | | | | | |||||
| * | | | | progs/trivial: test user clip plane in tri-point-line-clipped.c | Brian Paul | 2010-01-14 | 1 | -5/+30 |
| | | | | | |||||
| * | | | | progs/trivial: test glPolygonMode(POINT/LINE) with frustum clipping | Brian Paul | 2010-01-14 | 3 | -0/+93 |
| | |_|/ |/| | | | | | | | | | | | Note whether the new verts introduced by clipping show up as points and lines along the edge of the window... | ||||
| * | | | progs/egl: Fix screen surface demos. | Chia-I Wu | 2010-01-12 | 5 | -10/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> | ||||
| * | | | progs/egl: glGenTextures is called too early in xeglbindtex. | Chia-I Wu | 2010-01-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | It should be called after eglMakeCurrent. Signed-off-by: Chia-I Wu <[email protected]> | ||||
| * | | | progs: Check the number of configs returned by eglChooseConfig. | Chia-I Wu | 2010-01-12 | 6 | -10/+14 |
| | | | | | | | | | | | | | | | | | | | | | | A successful eglChooseConfig call does not imply there are valid configs. Signed-off-by: Chia-I Wu <[email protected]> | ||||
| * | | | progs: Add missing EGL_RENDERABLE_TYPE for EGL demos. | Chia-I Wu | 2010-01-12 | 6 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> | ||||
| * | | | Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa | Jesse Barnes | 2010-01-11 | 4 | -41/+274 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts due to DRI1 removal: src/mesa/drivers/dri/intel/intel_context.c src/mesa/drivers/dri/intel/intel_screen.c | ||||
| | * | | | xdemos/glsync: handle no sync method better | Jesse Barnes | 2010-01-08 | 1 | -8/+4 |
| | | | | | | | | | | | | | | | | | Print out count, finish rendering, etc. Makes the -sn option more useful. | ||||
| | * | | | xdemos/glsync: check glXMakeCurrent return value | Jesse Barnes | 2010-01-08 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | Since this program is used for testing, catching this case can be helpful. | ||||
| | * | | | xdemos/glsync: Make glsync test draw a rectangle | Jesse Barnes | 2010-01-08 | 1 | -34/+49 |
| | | | | | | | | | | | | | | | | | | | | | Doing simple buffer clears isn't enough to actually allocate render buffers, we need to do real drawing. | ||||
| | * | | | xdemos/glsync: Add swap interval support to glsync test | Jesse Barnes | 2010-01-08 | 1 | -3/+17 |
| | | | | | |||||
| | * | | | DRI2: add OML_sync_control support | Jesse Barnes | 2010-01-08 | 3 | -0/+204 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> | ||||
| * | | | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2010-01-08 | 9 | -120/+69 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_wm_emit.c | ||||
| | * | | | progs/fp: remove invalid tri-inv.c test | Brian Paul | 2010-01-07 | 3 | -113/+0 |
| | | | | | | | | | | | | | | | | | INV is not a valid instruction. | ||||
| | * | | | progs/demos: Assert that input to malloc is valid. | Vinson Lee | 2010-01-06 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | progs/xdemos: Check for string overflow. | Vinson Lee | 2010-01-06 | 1 | -3/+29 |
| | | | | | |||||
| | * | | | progs/xdemos: Check for string overflow. | Vinson Lee | 2010-01-06 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | progs/xdemos: Remove comma at end of enumerator list. | Vinson Lee | 2010-01-06 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | progs/xdemos: Use temporary variables. | Vinson Lee | 2010-01-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | This was missed from the previous commit to glxheads.c. | ||||
| | * | | | progs/glsl: Prevent possible string overflow. | Vinson Lee | 2010-01-06 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | progs/xdemos: Prevent possible string overflow. | Vinson Lee | 2010-01-06 | 1 | -1/+27 |
| | | | | | |||||
| * | | | | progs/fp: increase buffer size to read larger shaders | Brian Paul | 2010-01-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2010-01-04 | 13 | -76/+93 |
| |\| | | | |/ / |/| | | | | | | | | | | | | | | | | | | | | 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 | ||||
 |
index : mesa.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |