OpenGL2: Lightmap as an environment map renders incorrect with r_mergeLightmaps 1

[zturtleman]

In q3dm0, the blue monitor above the crosshair is incorrect in OpenGL2 with r_mergeLightmaps 1.

opengl1 renderer: (OpenGL2 looks similar with r_mergeLightmaps 0.)

OpenGL2 renderer:

The shader textures/base_wall/comp3c shader uses a stage:

        {
        map $lightmap
                tcGen environment
                blendFunc GL_ONE GL_ONE
    }

r_mergeLightmaps 1 combines the lightmaps. It would be closer if offset texcoords like in https://github.com/ioquake/ioq3/commit/ae0878ca618a737d7f8e843e8f4867bd34712cbe but tcGen environment will repeat and access other lightmaps.

[zturtleman]

It would be closer if offset texcoords like in https://github.com/ioquake/ioq3/commit/ae0878ca618a737d7f8e843e8f4867bd34712cbe but tcGen environment will repeat and access other lightmaps.

Never mind, offsetting it should be fine. tcGen environment is a sphere map; it doesn't pan outside of the 0.0 to 1.0 range.