~ubuntu-branches/ubuntu/jaunty/mesa/jaunty-proposed

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/intel/intel_tex_copy.c

Committer: Bazaar Package Importer
Author(s): Timo Aaltonen
Date: 2009-04-03 12:42:06 UTC
mfrom: (1.3.2 upstream)
mto: This revision was merged to the branch mainline in revision 70.
Revision ID: james.westby@ubuntu.com-20090403124206-vulvbgrn29zpeb2m

Tags: upstream-7.4

Import upstream version 7.4

files added:
docs/relnotes-7.4.html

progs/xdemos/Makefile~

src/mesa/drivers/dri/i915/intel_clear.c

src/mesa/drivers/dri/i915/intel_swapbuffers.c

src/mesa/drivers/dri/i965/intel_clear.c

src/mesa/drivers/dri/i965/intel_swapbuffers.c

src/mesa/drivers/dri/intel/intel_clear.c

src/mesa/drivers/dri/intel/intel_clear.h

src/mesa/drivers/dri/intel/intel_swapbuffers.c

src/mesa/drivers/dri/intel/intel_swapbuffers.h

files removed:
configs/linux-debug~

configs/linux-dri~

docs/README.MINGW32.orig

docs/memory.html

progs/demos/bug17404.c

progs/demos/gltc.h

progs/demos/rain.c

progs/demos/unzoom.c

progs/demos/viewdds.c

progs/glsl/Makefile~

progs/glsl/shader_1.vert

progs/glsl/shader_2.frag

progs/glsl/shadow_sampler.c

progs/glsl/shtest.c

progs/osdemos/readtex.c

progs/redbook/checker2.c

progs/samples/logo2.c

progs/xdemos/Makefile.orig

progs/xdemos/glthreads-tex.c

progs/xdemos/multictx.c

src/glut/glx/Makefile.mgw.orig

src/glut/glx/Makefile~

src/mesa/drivers/dri/i965/brw_metaops.c

src/mesa/drivers/dri/r200/radeon_chipset.h

src/mesa/drivers/dri/r200/radeon_screen.c

src/mesa/drivers/dri/r200/radeon_screen.h

src/mesa/drivers/dri/r300/radeon_chipset.h

src/mesa/drivers/dri/r300/radeon_screen.c

src/mesa/drivers/dri/r300/radeon_screen.h

src/mesa/drivers/dri/r300/radeon_span.h

src/mesa/main/mcompiler.h

src/mesa/shader/shader_debug.c

files modified:
Makefile

Makefile~

bin/mklib

configure

configure.ac

docs/download.html

docs/news.html

docs/relnotes-7.3.html

docs/relnotes.html

docs/xlibdriver.html

include/GL/gl.h

include/GL/gl_mangle.h

include/GL/glext.h

progs/demos/extfuncs.h

progs/glsl/multitex.c

progs/glsl/multitex.vert

progs/util/extfuncs.h

progs/xdemos/Makefile

progs/xdemos/glxgears.c

progs/xdemos/glxpixmap.c

progs/xdemos/manywin.c

src/glx/x11/dri2_glx.c

src/glx/x11/dri_glx.c

src/glx/x11/glxclient.h

src/glx/x11/glxcmds.c

src/glx/x11/indirect_vertex_program.c

src/glx/x11/pixelstore.c

src/mesa/drivers/dri/common/texmem.c

src/mesa/drivers/dri/gamma/gamma_tex.c

src/mesa/drivers/dri/i915/Makefile

src/mesa/drivers/dri/i915/i915_state.c

src/mesa/drivers/dri/i915/intel_state.c

src/mesa/drivers/dri/i915/intel_tris.c

src/mesa/drivers/dri/i965/Makefile

src/mesa/drivers/dri/i965/brw_cc.c

src/mesa/drivers/dri/i965/brw_clip.c

src/mesa/drivers/dri/i965/brw_clip_line.c

src/mesa/drivers/dri/i965/brw_clip_tri.c

src/mesa/drivers/dri/i965/brw_context.c

src/mesa/drivers/dri/i965/brw_context.h

src/mesa/drivers/dri/i965/brw_curbe.c

src/mesa/drivers/dri/i965/brw_draw.c

src/mesa/drivers/dri/i965/brw_eu.c

src/mesa/drivers/dri/i965/brw_eu.h

src/mesa/drivers/dri/i965/brw_fallback.c

src/mesa/drivers/dri/i965/brw_misc_state.c

src/mesa/drivers/dri/i965/brw_sf.c

src/mesa/drivers/dri/i965/brw_sf_emit.c

src/mesa/drivers/dri/i965/brw_sf_state.c

src/mesa/drivers/dri/i965/brw_state_upload.c

src/mesa/drivers/dri/i965/brw_tex.c

src/mesa/drivers/dri/i965/brw_vs.c

src/mesa/drivers/dri/i965/brw_vs.h

src/mesa/drivers/dri/i965/brw_vs_constval.c

src/mesa/drivers/dri/i965/brw_vs_emit.c

src/mesa/drivers/dri/i965/brw_vs_state.c

src/mesa/drivers/dri/i965/brw_vtbl.c

src/mesa/drivers/dri/i965/brw_wm.c

src/mesa/drivers/dri/i965/brw_wm.h

src/mesa/drivers/dri/i965/brw_wm_debug.c

src/mesa/drivers/dri/i965/brw_wm_emit.c

src/mesa/drivers/dri/i965/brw_wm_fp.c

src/mesa/drivers/dri/i965/brw_wm_glsl.c

src/mesa/drivers/dri/i965/brw_wm_pass0.c

src/mesa/drivers/dri/i965/brw_wm_pass1.c

src/mesa/drivers/dri/i965/brw_wm_sampler_state.c

src/mesa/drivers/dri/i965/brw_wm_state.c

src/mesa/drivers/dri/i965/brw_wm_surface_state.c

src/mesa/drivers/dri/i965/intel_state.c

src/mesa/drivers/dri/intel/intel_blit.c

src/mesa/drivers/dri/intel/intel_buffers.c

src/mesa/drivers/dri/intel/intel_buffers.h

src/mesa/drivers/dri/intel/intel_chipset.h

src/mesa/drivers/dri/intel/intel_context.c

src/mesa/drivers/dri/intel/intel_context.h

src/mesa/drivers/dri/intel/intel_decode.c

src/mesa/drivers/dri/intel/intel_fbo.c

src/mesa/drivers/dri/intel/intel_mipmap_tree.c

src/mesa/drivers/dri/intel/intel_mipmap_tree.h

src/mesa/drivers/dri/intel/intel_pixel.c

src/mesa/drivers/dri/intel/intel_pixel.h

src/mesa/drivers/dri/intel/intel_pixel_bitmap.c

src/mesa/drivers/dri/intel/intel_pixel_draw.c

src/mesa/drivers/dri/intel/intel_regions.c

src/mesa/drivers/dri/intel/intel_regions.h

src/mesa/drivers/dri/intel/intel_screen.c

src/mesa/drivers/dri/intel/intel_screen.h

src/mesa/drivers/dri/intel/intel_tex_copy.c

src/mesa/drivers/dri/intel/intel_tex_image.c

src/mesa/drivers/dri/intel/intel_tex_validate.c

src/mesa/drivers/dri/mga/mga_texstate.c

src/mesa/drivers/dri/r300/r300_render.c

src/mesa/drivers/dri/r300/r300_state.c

src/mesa/drivers/dri/r300/r300_swtcl.c

src/mesa/drivers/dri/radeon/radeon_chipset.h

src/mesa/drivers/dri/radeon/radeon_screen.c

src/mesa/drivers/dri/s3v/s3v_tex.c

src/mesa/drivers/dri/swrast/swrast.c

src/mesa/drivers/dri/swrast/swrast_priv.h

src/mesa/drivers/dri/swrast/swrast_span.c

src/mesa/drivers/dri/tdfx/tdfx_dd.c

src/mesa/drivers/x11/fakeglx.c

src/mesa/drivers/x11/glxapi.c

src/mesa/drivers/x11/xm_api.c

src/mesa/drivers/x11/xm_buffer.c

src/mesa/glapi/glapi_getproc.c

src/mesa/glapi/glthread.h

src/mesa/main/api_validate.c

src/mesa/main/attrib.c

src/mesa/main/bufferobj.c

src/mesa/main/buffers.c

src/mesa/main/config.h

src/mesa/main/context.c

src/mesa/main/dlopen.c

src/mesa/main/enable.c

src/mesa/main/execmem.c

src/mesa/main/extensions.c

src/mesa/main/framebuffer.c

src/mesa/main/get.c

src/mesa/main/getstring.c

src/mesa/main/hash.c

src/mesa/main/imports.c

src/mesa/main/imports.h

src/mesa/main/mtypes.h

src/mesa/main/state.c

src/mesa/main/stencil.c

src/mesa/main/texenv.c

src/mesa/main/texformat_tmp.h

src/mesa/main/teximage.c

src/mesa/main/texobj.c

src/mesa/main/texparam.c

src/mesa/main/texrender.c

src/mesa/main/texstate.c

src/mesa/main/version.h

src/mesa/shader/prog_instruction.h

src/mesa/shader/prog_print.c

src/mesa/shader/program.c

src/mesa/shader/shader_api.c

src/mesa/shader/slang/slang_codegen.c

src/mesa/shader/slang/slang_compile.c

src/mesa/shader/slang/slang_emit.c

src/mesa/shader/slang/slang_link.c

src/mesa/shader/slang/slang_vartable.c

src/mesa/swrast/s_fragprog.c

src/mesa/swrast/s_span.c

src/mesa/swrast/s_stencil.c

src/mesa/swrast/s_triangle.c

src/mesa/tnl/t_context.c

src/mesa/vbo/vbo_exec_api.c

src/mesa/vbo/vbo_exec_draw.c

src/mesa/vbo/vbo_save_draw.c

src/mesa/x86/gen_matypes.c

Show diffs side-by-side

added added

removed removed

src/mesa/drivers/dri/intel/intel_tex_copy.c

104

return GL_FALSE;

105

}

106

107

intelFlush(ctx);

107

intel_glFlush(ctx);

108

LOCK_HARDWARE(intel);

109

{

110

GLuint image_offset = intel_miptree_image_offset(intelImage->mt,

155

}

156

157

UNLOCK_HARDWARE(intel);

158

intel_glFlush(ctx);

158

159

160

/* GL_SGIS_generate_mipmap */

160

161

if (intelImage->level == texObj->BaseLevel && texObj->GenerateMipmap) {

Older »