omar 56ad2a2d74 Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/opengl2_example/imgui_impl_glfw_gl2.cpp
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/vulkan_example/main.cpp
#	imgui.h

2018-04-09 19:35:14 +02:00

..

build_win32.bat

Examples: Updated Makefile and batch files to work with new examples. Using lowercase "gl.h" as it seems this is what Linux wants.

2018-03-07 12:05:47 +01:00

build_win64.bat

Examples: Updated Makefile and batch files to work with new examples. Using lowercase "gl.h" as it seems this is what Linux wants.

2018-03-07 12:05:47 +01:00

CMakeLists.txt

Fixing minor english typos (#827)

2016-09-11 22:02:35 +02:00

gen_spv.sh

Add location decorators & change to use structs as in/out in glsl, update embedded spv (produced with glslangValidator -x)

2016-10-18 22:43:20 +02:00

glsl_shader.frag

Add location decorators & change to use structs as in/out in glsl, update embedded spv (produced with glslangValidator -x)

2016-10-18 22:43:20 +02:00

glsl_shader.vert

Vulkan example: Fix validation layer warnings and errors and redeclare gl_PerVertex.

2016-11-13 03:00:36 +01:00

main.cpp

Merge branch 'master' into viewport

2018-04-09 19:35:14 +02:00

vulkan_example.vcxproj

Examples: Using draw_data->DisplaySize, followup to c50198debe4978853f3f8ed6e84a7b2685991c06. Fix Vulkan secondary viewport rendering. SDL+Vulkan: Matched changes. Fix vcprojs. (#1542, #1042)

2018-03-13 23:07:12 +01:00

vulkan_example.vcxproj.filters

Examples: Vulkan: Extracted into imgui_impl_vulkan.*, reused imgui_impl_glfw* files.

2018-02-18 20:26:20 +01:00