Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'gles2-2' | Kristian Høgsberg | 2010-05-02 | 99 | -4257/+5042 |
|\ | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_util.h | ||||
| * | Hook in install rules for es1 and es2 | Kristian Høgsberg | 2010-05-02 | 3 | -0/+12 |
| | | |||||
| * | Add glesv2.pc and glesv1_cm.pc pkg-config files for ES 1 and 2 | Kristian Høgsberg | 2010-05-02 | 3 | -7/+26 |
| | | |||||
| * | st/mesa: Create context for API_OPENGL as first priority | Kristian Høgsberg | 2010-05-02 | 1 | -4/+4 |
| | | |||||
| * | gles: Build libGLESv1_CM.so and libGLESv2.so from glapi files | Kristian Høgsberg | 2010-04-28 | 4 | -0/+118 |
| | | |||||
| * | intel: Only register ES2 extensions for ES2 contexts | Kristian Høgsberg | 2010-04-28 | 7 | -2/+108 |
| | | |||||
| * | configure.ac: Add options to enable GLES1/2 API support | Kristian Høgsberg | 2010-04-28 | 4 | -0/+34 |
| | | |||||
| * | intel: Advertise GLES1/2 for i915+ when enabled | Kristian Høgsberg | 2010-04-28 | 1 | -0/+12 |
| | | |||||
| * | dri: Add DRI entrypoints to create a context for a given API | Kristian Høgsberg | 2010-04-28 | 8 | -13/+22 |
| | | |||||
| * | egl_dri2: Use new DRI API to create a GLES1/2 context when asked to | Kristian Høgsberg | 2010-04-28 | 1 | -10/+59 |
| | | |||||
| * | dri: Add DRI entrypoints to create a context for a given API | Kristian Høgsberg | 2010-04-28 | 27 | -32/+124 |
| | | |||||
| * | st/mesa: Move st_cb_drawtex.c to the mesa state tracker | Kristian Høgsberg | 2010-04-28 | 4 | -11/+2 |
| | | |||||
| * | es: Drop es specific enums.c | Kristian Høgsberg | 2010-04-28 | 2 | -22/+3 |
| | | |||||
| * | glapi: Regenerate enums.c for all APIs | Kristian Høgsberg | 2010-04-28 | 1 | -3147/+3449 |
| | | |||||
| * | glapi: Update gl_enum.py to generate enum tables for multiple APIs | Kristian Høgsberg | 2010-04-28 | 2 | -13/+19 |
| | | |||||
| * | mesa: Drop unused _mesa_init_drawtex_dispatch() | Kristian Høgsberg | 2010-04-28 | 2 | -23/+0 |
| | | |||||
| * | mesa: Move drawtex functionality to main/ | Kristian Høgsberg | 2010-04-28 | 4 | -2/+2 |
| | | |||||
| * | mesa: Move glQueryMatrixxOES() implementation to core mesa | Kristian Høgsberg | 2010-04-28 | 3 | -1/+1 |
| | | |||||
| * | mesa: Move GLES1 texgen functions to texgen.c | Kristian Høgsberg | 2010-04-28 | 4 | -74/+43 |
| | | |||||
| * | mesa: Move support for paletted textures to main/teximage.c | Kristian Høgsberg | 2010-04-28 | 7 | -49/+90 |
| | | |||||
| * | mesa: Handle GL_TEXTURE_GEN_STR_OES in _mesa_Enable() | Kristian Høgsberg | 2010-04-28 | 6 | -96/+37 |
| | | |||||
| * | mesa: Move get_es*.c to main/ | Kristian Høgsberg | 2010-04-27 | 5 | -12/+7 |
| | | |||||
| * | es: Prefix the get* functions with _es1/2 so they don't conflict | Kristian Høgsberg | 2010-04-27 | 5 | -19/+50 |
| | | |||||
| * | mesa: Move GL_RGB565 workaround into fbobject.c | Kristian Høgsberg | 2010-04-27 | 5 | -39/+23 |
| | | |||||
| * | mesa: Move GLES1/2 vbo entrypoints to vbo_exec_api.c | Kristian Høgsberg | 2010-04-27 | 4 | -110/+81 |
| | | | | | | | | This let's us drop stubs.c. | ||||
| * | mesa: Move GLES2 shader stubs to main/shaders.c | Kristian Høgsberg | 2010-04-27 | 3 | -23/+39 |
| | | |||||
| * | mesa: Move api_exec_es*.c into mesa/main | Kristian Høgsberg | 2010-04-27 | 12 | -32/+114 |
| | | | | | | | | | | This requires renaming a few functions to have unique names so that they can all live within the same driver. | ||||
| * | mesa: Move references to main/remap_helper.h to api_exec.c | Kristian Høgsberg | 2010-04-27 | 6 | -63/+100 |
| | | |||||
| * | mesa: Move struct _glapi_table allocation out of context.c | Kristian Høgsberg | 2010-04-22 | 6 | -22/+48 |
| | | | | | | | | | | | | 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. | ||||
| * | mesa: Compute extension string according to API | Kristian Høgsberg | 2010-04-22 | 5 | -324/+113 |
| | | | | | | | | We can now stop special casing glGetString() and drop specials_es*.c. | ||||
| * | es2: Move over es2 code to compute extensions | Kristian Høgsberg | 2010-04-22 | 1 | -3/+106 |
| | | |||||
| * | main: Report GL_SHADING_LANGUAGE_VERSION according to API | Kristian Høgsberg | 2010-04-22 | 2 | -12/+27 |
| | | |||||
| * | mesa: Compute GL version according to API | Kristian Høgsberg | 2010-04-22 | 3 | -80/+107 |
| | | |||||
| * | mesa: Move API specific context intialization into context.c | Kristian Høgsberg | 2010-04-22 | 4 | -37/+25 |
| | | |||||
| * | st/mesa: Use API-aware context constructor | Kristian Høgsberg | 2010-04-22 | 1 | -1/+10 |
| | | | | | | | | | | | | 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. | ||||
| * | mesa: Track the OpenGL API we're implementing in the context | Kristian Høgsberg | 2010-04-22 | 3 | -11/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | r300g: always set the pitch of the first miplevel in the tiling flags | Marek Olšák | 2010-05-02 | 1 | -2/+2 |
| | | | | | | | | This further reduces the number of DRM calls and flushes. | ||||
* | | Revert "r300g: disable point sprites (again)" | Marek Olšák | 2010-05-02 | 1 | -4/+1 |
| | | | | | | | | This reverts commit 3e0f1719d411b34f77fd2a053ecf83b43bb836ca. | ||||
* | | r300g: merge VS output mapping state (VAP) to rasterizer block state (RS) | Marek Olšák | 2010-05-02 | 8 | -207/+96 |
| | | | | | | | | | | | | | | | | | | | | | | | | These two should be tied together because what's set in VAP or stuffed in GA should be rasterized in RS. Not doing so causes a hardlock. The reason for the merge is that if stuffed texture coordinates (e.g. point sprite texgen) happen to occupy the texcoord slot dedicated to fog or wpos, the two must be relocated to other free slots, which needs remapping the vertex shader outputs. The rasterizer code is now literally a sequence read-rasterize-write. | ||||
* | | r300g: inline update_derived_shader_state | Marek Olšák | 2010-05-02 | 1 | -12/+5 |
| | | |||||
* | | r300g: fix segfault when resizing a DRI2 framebuffer | Marek Olšák | 2010-05-02 | 1 | -37/+4 |
| | | | | | | | | | | | | Resetting tiling flags might happen after a texture is destroyed... Looking at the kernel sources, we don't actually need to reset the tiling flags. | ||||
* | | r300g: cache tiling flags to reduce the number of DRM calls | Marek Olšák | 2010-05-02 | 1 | -6/+9 |
| | | |||||
* | | mesa: s/sprintf/_mesa_snprintf/ | Vinson Lee | 2010-05-02 | 6 | -12/+12 |
| | | |||||
* | | i965g: s/sprintf/util_snprintf/ | Vinson Lee | 2010-05-02 | 1 | -5/+6 |
| | | |||||
* | | glsl: s/sprintf/_mesa_snprintf/ | Vinson Lee | 2010-05-01 | 7 | -29/+29 |
| | | |||||
* | | glapi: s/strcpy/strncpy/ | Vinson Lee | 2010-05-01 | 1 | -1/+2 |
| | | |||||
* | | llvmpipe: Remove unused variable. | Vinson Lee | 2010-05-01 | 1 | -2/+0 |
| | | |||||
* | | progs/tests: Remove meaningless const qualifiers. | Vinson Lee | 2010-05-01 | 12 | -12/+12 |
| | | |||||
* | | swrastg: Use trace | Jakob Bornecrantz | 2010-05-01 | 2 | -2/+4 |
| | | |||||
* | | progs/demos: Remove meaningless const qualifier in vao_demo.c. | Vinson Lee | 2010-05-01 | 1 | -1/+1 |
| | |