libobs-d3d11: Fix initializer list ordering

Microsoft's compiler doesn't seem to care about warning about things
like initializer list ordering.  Mingw actually reports on this to
prevent potential confusion about ordering.
master
jp9000 2015-02-09 01:03:33 -08:00
parent f4406e71f4
commit 1b2c3a6176
6 changed files with 12 additions and 12 deletions

View File

@ -45,7 +45,7 @@ static inline bool get_monitor(gs_device_t *device, int monitor_idx,
}
gs_duplicator::gs_duplicator(gs_device_t *device_, int monitor_idx)
: device(device_), texture(nullptr)
: texture(nullptr), device(device_)
{
ComPtr<IDXGIOutput1> output1;
ComPtr<IDXGIOutput> output;

View File

@ -40,10 +40,10 @@ void gs_index_buffer::InitBuffer()
gs_index_buffer::gs_index_buffer(gs_device_t *device, enum gs_index_type type,
void *indices, size_t num, uint32_t flags)
: device (device),
dynamic ((flags & GS_DYNAMIC) != 0),
type (type),
indices (indices),
num (num),
dynamic ((flags & GS_DYNAMIC) != 0)
indices (indices)
{
switch (type) {
case GS_UNSIGNED_SHORT: indexSize = 2; break;

View File

@ -147,8 +147,8 @@ void ShaderProcessor::BuildInputLayout(
}
gs_shader_param::gs_shader_param(shader_var &var, uint32_t &texCounter)
: type (get_shader_param_type(var.type)),
name (var.name),
: name (var.name),
type (get_shader_param_type(var.type)),
textureID (texCounter),
arrayCount (var.array_count),
changed (false)

View File

@ -264,8 +264,8 @@ struct gs_texture {
inline gs_texture(gs_device *device, gs_texture_type type,
uint32_t levels, gs_color_format format)
: device (device),
type (type),
: type (type),
device (device),
levels (levels),
format (format)
{

View File

@ -149,10 +149,10 @@ gs_texture_2d::gs_texture_2d(gs_device_t *device, uint32_t width,
width (width),
height (height),
dxgiFormat (ConvertGSTextureFormat(format)),
isGDICompatible (gdiCompatible),
isShared (shared),
isDynamic ((flags & GS_DYNAMIC) != 0),
isRenderTarget ((flags & GS_RENDER_TARGET) != 0),
isGDICompatible (gdiCompatible),
isDynamic ((flags & GS_DYNAMIC) != 0),
isShared (shared),
genMipmaps ((flags & GS_BUILD_MIPMAPS) != 0)
{
InitTexture(data);

View File

@ -96,9 +96,9 @@ inline void gs_vertex_buffer::InitBuffer(const size_t elementSize,
gs_vertex_buffer::gs_vertex_buffer(gs_device_t *device, struct gs_vb_data *data,
uint32_t flags)
: device (device),
dynamic ((flags & GS_DYNAMIC) != 0),
vbd (data),
numVerts (data->num),
dynamic ((flags & GS_DYNAMIC) != 0)
numVerts (data->num)
{
if (!data->num)
throw "Cannot initialize vertex buffer with 0 vertices";