mrfixit2001 0ab6c59fbe Avoid possible compile error: conflicting defs ...

In some cases, depending on the build flags, these two lines can be actively compiled at the same time, resulting in a conflicting definitions error:
https://github.com/hrydgard/ppsspp/blob/master/GPU/Common/DrawEngineCommon.h#L41
https://github.com/hrydgard/ppsspp/blob/master/GPU/Common/TextureDecoder.h#L88

I believe all that's necessary here is to add these "or" clauses to avoid it and safeguard against the error.

2018-11-26 14:59:14 -05:00

..

Common

Avoid possible compile error: conflicting defs

2018-11-26 14:59:14 -05:00

D3D11

D3D11: Correct shader bounds apply.

2018-11-24 10:51:47 -08:00

Debugger

GE Debugger: Support record for more render types.

2018-11-17 22:12:45 -08:00

Directx9

D3D9: Correct shader bounds apply.

2018-11-24 10:47:49 -08:00

GLES

D3D11: Allow shader blend to self.

2018-11-24 10:19:28 -08:00

Null

GE Debugger: Rename depth clamp more places.

2018-08-11 16:33:39 -07:00

Software

SoftGPU: Calculate texcoords in transform.

2018-11-25 19:19:11 -08:00

Vulkan

D3D11: Allow shader blend to self.

2018-11-24 10:19:28 -08:00

ge_constants.h

GPU: Skip specular on powered diffuse.

2018-11-22 07:59:56 -08:00

GeDisasm.cpp

GE Debugger: Rename depth clamp more places.

2018-08-11 16:33:39 -07:00

GeDisasm.h

Slightly improve GPU disassembly

2014-09-13 23:51:07 +02:00

GPU.cpp

Attempt to fix the last very common issue of #11493 by being paranoid

2018-11-21 22:40:54 +01:00

GPU.h

GPU: Track stats on uploads.

2017-12-28 19:27:45 -08:00

GPU.vcxproj

GE Debugger: Factor out host calls some.

2018-09-01 08:32:03 -07:00

GPU.vcxproj.filters

GE Debugger: Factor out host calls some.

2018-09-01 08:32:03 -07:00

GPUCommon.cpp

GPU: Correctly flush on cull mode change.

2018-11-25 16:56:39 -08:00

GPUCommon.h

GPU: Cancel shader preload on shutdown/lost.

2018-10-30 20:32:12 -07:00

GPUInterface.h

GPU: Cancel shader preload on shutdown/lost.

2018-10-30 20:32:12 -07:00

GPUState.cpp

Revert "Remove further remains of hardware skinning."

2018-04-10 12:22:41 +02:00

GPUState.h

GPU: Skip specular on powered diffuse.

2018-11-22 07:59:56 -08:00

Math3D.cpp

[spline/bezier]Move SIMD optimization of vector operations to Math3D.h.

2018-10-07 23:53:43 +09:00

Math3D.h

Math3D: Something wrong with hand simd optimization in vec2<float>, so it causes very slow down.

2018-10-07 23:54:17 +09:00